30 lines
1.6 KiB
Diff
30 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
|
||
|
|
index 2feb187f62be5cf5d354a1e806087417cc189ab1..07fe8e72a7ff01d872dd5b04ccbc435e82ebe990 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/BlockGetter.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
|
||
|
|
@@ -58,7 +58,15 @@ public interface BlockGetter {
|
||
|
|
|
||
|
|
// CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
|
||
|
|
default BlockHitResult rayTraceBlock(ClipContext raytrace1, BlockPos blockposition) {
|
||
|
|
- BlockState iblockdata = this.getBlockState(blockposition);
|
||
|
|
+ // Paper start - Prevent raytrace from loading chunks
|
||
|
|
+ BlockState iblockdata = this.getTypeIfLoaded(blockposition);
|
||
|
|
+ if (iblockdata == null) {
|
||
|
|
+ // copied the last function parameter (listed below)
|
||
|
|
+ Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
|
||
|
|
+
|
||
|
|
+ return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), new BlockPos(raytrace1.getTo()));
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
FluidState fluid = this.getFluidState(blockposition);
|
||
|
|
Vec3 vec3d = raytrace1.getFrom();
|
||
|
|
Vec3 vec3d1 = raytrace1.getTo();
|