From f0c2a7a8094163a8383abd54ab0932eceb7a05ad Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Jul 2020 19:20:50 -0500 Subject: [PATCH] Fix armorstand entity lookups paper.yml setting not being used --- ...ntity-lookups-paper.yml-setting-not-.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 patches/server/0103-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch diff --git a/patches/server/0103-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch b/patches/server/0103-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch new file mode 100644 index 000000000..99438b3da --- /dev/null +++ b/patches/server/0103-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 4 Jul 2020 19:19:13 -0500 +Subject: [PATCH] Fix armorstand entity lookups paper.yml setting not being + used + + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index fd31212e0b..14eadf64e7 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -974,13 +974,6 @@ public abstract class World implements GeneratorAccess, AutoCloseable { + } + MinecraftServer.getServer().executeMidTickTasks(); // Tuinity - execute chunk tasks mid tick + } +- // Paper start - Prevent armor stands from doing entity lookups +- @Override +- public boolean getCubes(@Nullable Entity entity, AxisAlignedBB axisAlignedBB) { +- if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return false; +- return GeneratorAccess.super.getCubes(entity, axisAlignedBB); +- } +- // Paper end + + public Explosion explode(@Nullable Entity entity, double d0, double d1, double d2, float f, Explosion.Effect explosion_effect) { + return this.createExplosion(entity, (DamageSource) null, (ExplosionDamageCalculator) null, d0, d1, d2, f, false, explosion_effect); +diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java +index 918a82d466..39107b067c 100644 +--- a/src/main/java/net/minecraft/server/WorldServer.java ++++ b/src/main/java/net/minecraft/server/WorldServer.java +@@ -688,6 +688,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { + + @Override + public boolean getCubes(@Nullable Entity entity, AxisAlignedBB axisalignedbb) { ++ if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return false; // Paper // Purpur - moved from World + return !this.hasAnyCollisions(entity, axisalignedbb); + } +