diff options
Diffstat (limited to 'patches/server/0216-Option-to-prevent-armor-stands-from-doing-entity-loo.patch')
-rw-r--r-- | patches/server/0216-Option-to-prevent-armor-stands-from-doing-entity-loo.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/server/0216-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0216-Option-to-prevent-armor-stands-from-doing-entity-loo.patch new file mode 100644 index 0000000000..474a50ce86 --- /dev/null +++ b/patches/server/0216-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Hugo Manrique <[email protected]> +Date: Mon, 23 Jul 2018 12:57:39 +0200 +Subject: [PATCH] Option to prevent armor stands from doing entity lookups + + +diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +index dae6835696e90bc5a541cacd37ea7aa88c60f4f4..1057679ceec86898a3e62bd183c6944f561aa7fd 100644 +--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java ++++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +@@ -343,6 +343,7 @@ public class ArmorStand extends LivingEntity { + + @Override + protected void pushEntities() { ++ if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper - Option to prevent armor stands from doing entity lookups + List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS); + Iterator iterator = list.iterator(); + +diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java +index 27e2718124aad69546c1d9adb9c8e69fa4a43ca7..16c244f56813479b2e51f1d883ff739949fc86e3 100644 +--- a/src/main/java/net/minecraft/world/level/Level.java ++++ b/src/main/java/net/minecraft/world/level/Level.java +@@ -764,6 +764,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + // Paper end - Prevent block entity and entity crashes + } + } ++ // Paper start - Option to prevent armor stands from doing entity lookups ++ @Override ++ public boolean noCollision(@Nullable Entity entity, AABB box) { ++ if (entity instanceof net.minecraft.world.entity.decoration.ArmorStand && !entity.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return false; ++ return LevelAccessor.super.noCollision(entity, box); ++ } ++ // Paper end - Option to prevent armor stands from doing entity lookups + + public boolean shouldTickDeath(Entity entity) { + return true; |