2019-12-12 00:03:31 +00:00
|
|
|
From 76c9cc9efc90a7643e725cad6fec6e30170cd4e5 Mon Sep 17 00:00:00 2001
|
2018-07-23 11:08:02 +00:00
|
|
|
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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-12-12 00:03:31 +00:00
|
|
|
index b4e5948cc..0a99b8fe9 100644
|
2018-07-23 11:08:02 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-12-12 00:03:31 +00:00
|
|
|
@@ -386,4 +386,9 @@ public class PaperWorldConfig {
|
|
|
|
log("Bed Search Radius: " + bedSearchRadius);
|
2018-07-23 11:08:02 +00:00
|
|
|
}
|
|
|
|
}
|
2019-12-12 00:03:31 +00:00
|
|
|
+
|
2018-07-23 11:08:02 +00:00
|
|
|
+ public boolean armorStandEntityLookups = true;
|
|
|
|
+ private void armorStandEntityLookups() {
|
|
|
|
+ armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
|
|
|
|
+ }
|
2019-12-12 00:03:31 +00:00
|
|
|
}
|
2018-07-23 11:08:02 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2019-12-12 00:03:31 +00:00
|
|
|
index 7fcc8c52d..eea3a542d 100644
|
2018-07-23 11:08:02 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2019-12-12 00:03:31 +00:00
|
|
|
@@ -788,6 +788,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
2019-05-14 02:20:58 +00:00
|
|
|
}
|
2018-07-23 11:08:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Prevent armor stands from doing entity lookups
|
|
|
|
+ @Override
|
|
|
|
+ public boolean getCubes(@Nullable Entity entity, AxisAlignedBB axisAlignedBB) {
|
|
|
|
+ if (entity instanceof EntityArmorStand && !entity.world.paperConfig.armorStandEntityLookups) return false;
|
2019-12-12 00:03:31 +00:00
|
|
|
+ return GeneratorAccess.super.getCubes(entity, axisAlignedBB)
|
2018-07-23 11:08:02 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
2019-12-12 00:03:31 +00:00
|
|
|
public boolean b(AxisAlignedBB axisalignedbb) {
|
2018-10-22 23:16:21 +00:00
|
|
|
int i = MathHelper.floor(axisalignedbb.minX);
|
|
|
|
int j = MathHelper.f(axisalignedbb.maxX);
|
2018-07-23 11:08:02 +00:00
|
|
|
--
|
2019-12-12 00:03:31 +00:00
|
|
|
2.24.0
|
2018-07-23 11:08:02 +00:00
|
|
|
|