2018-12-03 00:31:09 +01:00
|
|
|
From d36659fc24b2fb5cd2bba1f559f8572abe765ad8 Mon Sep 17 00:00:00 2001
|
2018-11-27 01:24:48 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
|
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
|
2018-12-03 00:31:09 +01:00
|
|
|
index 027871c00..00773a9af 100644
|
2018-11-27 01:24:48 +01:00
|
|
|
--- 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.b(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.b(blockposition);
|
|
|
|
|
|
|
|
|
|
if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
|
|
|
|
|
--
|
|
|
|
|
2.19.1
|
|
|
|
|
|
