aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff options
context:
space:
mode:
authorZach Brown <[email protected]>2017-04-29 05:27:31 -0500
committerZach Brown <[email protected]>2017-04-29 05:27:31 -0500
commit974b0afca91844fed61c5fda9293bbcd88752c2f (patch)
treed3a7b65e14f34b7cc8928efaf6403f67eaaaf708 /Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
parent8b2122a291e3ea68f0e1516209914ef43a2d55e9 (diff)
downloadPaper-974b0afca91844fed61c5fda9293bbcd88752c2f.tar.gz
Paper-974b0afca91844fed61c5fda9293bbcd88752c2f.zip
Remove last bit of chunk exists region file fix
CraftBukkit removed their implementation that caused this issue, switching to Mojang's implementation which doesn't appear to share it. I already removed the important bit in the last upstream merge, this is just unused and unnecessary now. So we remove it.
Diffstat (limited to 'Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch')
-rw-r--r--Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
new file mode 100644
index 0000000000..55a45627a9
--- /dev/null
+++ b/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -0,0 +1,35 @@
+From 7f5079d03bd22c1497fe715871a55339268944ec 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.windows.2
+