36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
|
From b5fc17d23094f1c25d9bae76e0bff778afea011e Mon Sep 17 00:00:00 2001
|
||
|
|
From: kashike <kashike@vq.lc>
|
||
|
|
Date: Wed, 21 Dec 2016 11:52:04 -0600
|
||
|
|
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index a655b33..e8762c4 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -409,4 +409,9 @@ public class PaperWorldConfig {
|
||
|
|
log("Treasure Maps will return already discovered locations");
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean armorStandEntityLookups = true;
|
||
|
|
+ private void armorStandEntityLookups() {
|
||
|
|
+ armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||
|
|
index 2911c65..6d548dd 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||
|
|
@@ -1332,6 +1332,7 @@ public abstract class World implements IBlockAccess {
|
||
|
|
|
||
|
|
this.a(entity, axisalignedbb, false, arraylist);
|
||
|
|
if (entity != null) {
|
||
|
|
+ if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return arraylist; // Paper
|
||
|
|
List list = this.getEntities(entity, axisalignedbb.g(0.25D));
|
||
|
|
|
||
|
|
for (int i = 0; i < list.size(); ++i) {
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|