Fix armor stands still doing entity collision

This commit is contained in:
Yive 2020-10-25 11:06:01 -07:00
parent 81113bd07b
commit ad16dcceca

View file

@ -18,6 +18,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@Override
protected void collideNearby() {
+ if (!world.paperConfig.armorStandEntityLookups) return; // Paper
List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), EntityArmorStand.br);
for (int i = 0; i < list.size(); ++i) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/World.java