diff options
Diffstat (limited to 'Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch')
| -rw-r--r-- | Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch new file mode 100644 index 0000000000..beec156856 --- /dev/null +++ b/Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch @@ -0,0 +1,35 @@ +From 11841ac355d403ada181a7bb338119c8df19c2ed Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +Date: Mon, 26 Nov 2018 19:21:58 -0500 +Subject: [PATCH] Prevent rayTrace from loading chunks + +ray tracing into an unloaded chunk should be treated as a miss +this saves a ton of lag for when AI tries to raytrace near unloaded chunks. + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index c9a65f7a60..789f9b63c1 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc + int i1 = MathHelper.floor(d1); + int j1 = MathHelper.floor(d2); + BlockPosition blockposition = new BlockPosition(l, i1, j1); +- IBlockData iblockdata = this.getType(blockposition); ++ IBlockData iblockdata = this.getTypeIfLoaded(blockposition); // Paper ++ if (iblockdata == null) return null; // Paper + Fluid fluid = this.getFluid(blockposition); + boolean flag2; + boolean flag3; +@@ -982,7 +983,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc + i1 = MathHelper.floor(d1) - (enumdirection == EnumDirection.UP ? 1 : 0); + j1 = MathHelper.floor(d2) - (enumdirection == EnumDirection.SOUTH ? 1 : 0); + blockposition = new BlockPosition(l, i1, j1); +- IBlockData iblockdata1 = this.getType(blockposition); ++ IBlockData iblockdata1 = this.getTypeIfLoaded(blockposition); // Paper ++ if (iblockdata1 == null) return null; // Paper + Fluid fluid1 = this.getFluid(blockposition); + + if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) { +-- +2.21.0 + |