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
|
2023-09-22 00:01:00 +02:00
|
|
|
index 37c19685049ef6b267a74a4323dc4ec33159c3d2..4859a4c78e59745ef75155bc8d6915fce5a217d8 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
|
2023-03-14 19:59:51 +01:00
|
|
|
@@ -337,6 +337,7 @@ public class ArmorStand extends LivingEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
protected void pushEntities() {
|
2023-06-07 22:19:14 +02:00
|
|
|
+ if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper
|
|
|
|
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
|
2023-09-22 22:13:57 +02:00
|
|
|
index ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6..0b02ba70956ea1352ea8e67957b3789408b67f6b 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
|
2023-09-22 22:13:57 +02:00
|
|
|
@@ -849,6 +849,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) {
|
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);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
2021-11-23 16:04:41 +01:00
|
|
|
public boolean shouldTickDeath(Entity entity) {
|
|
|
|
return true;
|