diff options
Diffstat (limited to 'Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch')
-rw-r--r-- | Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch new file mode 100644 index 0000000000..e0856ef943 --- /dev/null +++ b/Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -0,0 +1,35 @@ +From 46d75afb644e494d0ca3527f0eb81c7ab7cfea93 Mon Sep 17 00:00:00 2001 +From: kashike <[email protected]> +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 bf2916802..61efcc479 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java ++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +@@ -403,4 +403,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 7af76e14c..2028cf81e 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -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) { +-- +2.12.2 + |