2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com>
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
2024-10-23 12:32:08 +02:00
index aea97a30a9226275f8fbf9cb2c15d5ddf36371ac..e9d6211eb0f955eb95d2f73ad96799ef4740d506 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
2024-10-23 12:32:08 +02:00
@@ -348,6 +348,7 @@ public class ArmorStand extends LivingEntity {
2021-06-11 14:02:28 +02:00
@Override
protected void pushEntities() {
2024-01-21 19:37:09 +01:00
+ if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper - Option to prevent armor stands from doing entity lookups
2023-06-07 22:19:14 +02:00
List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS);
2023-09-22 00:01:00 +02:00
Iterator iterator = list.iterator();
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
2024-10-27 18:11:15 +01:00
index e0986a141384de0ede38c88c2b116e083c63efe4..fb68aff87670f545ae5ba26db9f074a34375031e 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
2024-10-27 18:11:15 +01:00
@@ -759,6 +759,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
2024-01-24 11:45:17 +01:00
// Paper end - Prevent block entity and entity crashes
2021-06-11 14:02:28 +02:00
}
}
2024-01-21 19:37:09 +01:00
+ // Paper start - Option to prevent armor stands from doing entity lookups
2021-06-11 14:02:28 +02:00
+ @Override
+ public boolean noCollision(@Nullable Entity entity, AABB box) {
2023-06-07 23:46:56 +02:00
+ if (entity instanceof net.minecraft.world.entity.decoration.ArmorStand && !entity.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return false;
2021-06-11 14:02:28 +02:00
+ return LevelAccessor.super.noCollision(entity, box);
+ }
2024-01-21 19:37:09 +01:00
+ // Paper end - Option to prevent armor stands from doing entity lookups
2021-06-11 14:02:28 +02:00
2021-11-23 16:04:41 +01:00
public boolean shouldTickDeath(Entity entity) {
return true;