Paper/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch

36 lines
1.5 KiB
Diff
Raw Normal View History

2017-03-15 15:32:50 +01:00
From 3788bfea0a0f0b8dd5f856e8fc97c1ba6417359f 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
2017-03-15 15:32:50 +01:00
index a655b331..e8762c48 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
2017-03-15 15:32:50 +01:00
index eea9c598..fa251672 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2017-03-15 15:32:50 +01:00
@@ -1331,6 +1331,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) {
--
2017-03-15 15:32:50 +01:00
2.12.0.windows.1