2019-06-14 02:27:40 +00:00
|
|
|
From 7d902591943518002acd1d7d4ce88b4ef7847de0 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-06-06 15:36:57 +00:00
|
|
|
index 83e54cb904..f06bb3ae19 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-04-30 01:20:24 +00:00
|
|
|
@@ -326,6 +326,11 @@ public class PaperWorldConfig {
|
2018-07-23 11:08:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public boolean armorStandEntityLookups = true;
|
|
|
|
+ private void armorStandEntityLookups() {
|
|
|
|
+ armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
public int maxCollisionsPerEntity;
|
|
|
|
private void maxEntityCollision() {
|
|
|
|
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2019-06-11 00:29:30 +00:00
|
|
|
index 299a316a4b..d205ec01ac 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-06-11 00:29:30 +00:00
|
|
|
@@ -873,6 +873,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
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;
|
|
|
|
+ return GeneratorAccess.super.getCubes(entity, axisAlignedBB);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
public boolean a(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-03-20 01:46:00 +00:00
|
|
|
2.21.0
|
2018-07-23 11:08:02 +00:00
|
|
|
|