From 7fea752ffccc17cbf6b01fcb28b237d570b920ca Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 30 May 2018 15:38:27 -0500 Subject: [PATCH] Fix config key on last commit --- .../0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch | 6 +++--- .../0141-Toggleable-Elytra-Wall-Damage.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch index c7277259e..15fa48e60 100644 --- a/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 9b474a298c2d17cf09c33059a5265c14b75b1a0e Mon Sep 17 00:00:00 2001 +From b1794a06ccd794dd501b048241fb45d7d2d5364d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s wasting cpu cycles on saving/unloading/reloading chunks repeatedly. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ce43e7bb..5367fead 100644 +index ce43e7bb..e35e72e8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -344,4 +344,18 @@ public class PaperWorldConfig { @@ -36,7 +36,7 @@ index ce43e7bb..5367fead 100644 + + public boolean skipEntityTickingInChunksScheduledForUnload = true; + private void skipEntityTickingInChunksScheduledForUnload() { -+ skipEntityTickingInChunksScheduledForUnload = getBoolean("settings.skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload); ++ skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload); + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch index 5a62e12a7..16966d117 100644 --- a/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch +++ b/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch @@ -1,4 +1,4 @@ -From 358cce0396af34c1ddee7fa64cdf6467549d49fd Mon Sep 17 00:00:00 2001 +From 896c321ce8db0590409d3d5b9b9751f5806c8dad Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Sat, 18 Jun 2016 23:13:59 -0700 Subject: [PATCH] Toggleable Elytra Wall Damage @@ -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 5367fead..3aa6f89e 100644 +index e35e72e8..1b9eb7f4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -358,4 +358,9 @@ public class PaperWorldConfig { private void skipEntityTickingInChunksScheduledForUnload() { - skipEntityTickingInChunksScheduledForUnload = getBoolean("settings.skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload); + skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload); } + + public boolean elytraHitWallDamage = true;