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
|
2022-06-09 10:51:45 +02:00
|
|
|
index ed698f3e3f9ed6003fe621c5f6f7e3a151a1a559..9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be 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
|
2022-06-07 23:45:11 +02:00
|
|
|
@@ -336,6 +336,7 @@ public class ArmorStand extends LivingEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
protected void pushEntities() {
|
2022-06-09 10:51:45 +02:00
|
|
|
+ if (!level.paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper
|
2021-11-23 16:04:41 +01:00
|
|
|
List<Entity> list = this.level.getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS);
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
for (int i = 0; i < list.size(); ++i) {
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
2022-06-09 10:51:45 +02:00
|
|
|
index ad0f91d57b5cbf0c4439993ad99ec7a484729a2e..ed29841c17a4d29ca05cbd307fa474d2208f5b3f 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
|
2022-06-09 10:51:45 +02:00
|
|
|
@@ -735,6 +735,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
2021-06-11 14:02:28 +02:00
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ // Paper start - Prevent armor stands from doing entity lookups
|
|
|
|
+ @Override
|
|
|
|
+ public boolean noCollision(@Nullable Entity entity, AABB box) {
|
2022-06-09 10:51:45 +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);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
2021-11-23 16:04:41 +01:00
|
|
|
public boolean shouldTickDeath(Entity entity) {
|
|
|
|
return true;
|