Skip Entity and Tile Entity ticking in chunks scheduled for unload (#1132)

Fixes #1131
This commit is contained in:
Mark Vainomaa
2018-05-30 23:31:55 +03:00
parent 0576336943
commit df3df43dea
24 changed files with 97 additions and 58 deletions

View File

@@ -7,12 +7,12 @@ Instead of calculating the damage taken from hitting a wall, you can
disable it in the config.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 112c447e2..d182e716a 100644
index 5367fead..3aa6f89e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
delayChunkUnloadsBy *= 1000;
}
private void skipEntityTickingInChunksScheduledForUnload() {
skipEntityTickingInChunksScheduledForUnload = getBoolean("settings.skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
}
+
+ public boolean elytraHitWallDamage = true;
@@ -21,7 +21,7 @@ index 112c447e2..d182e716a 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4b6bb38ae..dda6219a7 100644
index 4b6bb38a..dda6219a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {