2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2020-08-25 02:22:08 +00:00
|
|
|
index 6352051ab937d4d365e823a7112e76dc3ec34225..92ddf96f7db08a2b390ef3f49b0643f9d90bbea4 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
|
2020-08-25 02:22:08 +00:00
|
|
|
@@ -372,4 +372,9 @@ public class PaperWorldConfig {
|
|
|
|
private void scanForLegacyEnderDragon() {
|
|
|
|
scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
|
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
|
2020-08-25 02:22:08 +00:00
|
|
|
index b6af67e7625dd6e24fad5812d4b563b6ce91bede..6202788306bea557c4699698a61c9336eb63a55d 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
|
2020-08-25 02:22:08 +00:00
|
|
|
@@ -802,6 +802,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
2020-06-25 14:09:55 +00:00
|
|
|
// Paper end
|
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 03:00:50 +00:00
|
|
|
+ return GeneratorAccess.super.getCubes(entity, axisAlignedBB);
|
2018-07-23 11:08:02 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2020-06-25 14:09:55 +00:00
|
|
|
|
|
|
|
public Explosion explode(@Nullable Entity entity, double d0, double d1, double d2, float f, Explosion.Effect explosion_effect) {
|
|
|
|
return this.createExplosion(entity, (DamageSource) null, (ExplosionDamageCalculator) null, d0, d1, d2, f, false, explosion_effect);
|