From d75469a33de6c8491143105005c1c15b87347f39 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Thu, 4 Jun 2015 03:57:23 -0700 Subject: [PATCH] Migrate old TNT height nerf settings to falling block height nerf --- .../0002-PaperSpigot-config-files.patch | 10 ++-- ...ck-entities-that-are-above-the-speci.patch | 50 +++++++++++++++++-- ...le-speed-for-water-flowing-over-lava.patch | 10 ++-- ...ve-invalid-mob-spawner-tile-entities.patch | 8 +-- ...ntities-that-fly-through-unloaded-ch.patch | 8 +-- ...-Configurable-game-mechanics-changes.patch | 8 +-- ...nfigurable-top-of-nether-void-damage.patch | 8 +-- .../0039-Fix-redstone-lag-issues.patch | 6 +-- ...042-Configurable-async-light-updates.patch | 6 +-- .../0043-Optimize-draining.patch | 6 +-- ...r-crits-helps-mitigate-hacked-client.patch | 6 +-- ...ble-end-credits-when-leaving-the-end.patch | 6 +-- ...s-for-specific-entities-that-fly-thr.patch | 6 +-- .../0053-Generator-Settings.patch | 6 +-- 14 files changed, 93 insertions(+), 51 deletions(-) diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index 6313f56a6..6c90ff6a2 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,4 +1,4 @@ -From e025f6bcd4c2a4211b4c72eeaf18af8d319f38ca Mon Sep 17 00:00:00 2001 +From 617b628170e99f7bb483692f80d881180a5d953c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 May 2015 00:08:15 -0500 Subject: [PATCH] PaperSpigot config files @@ -88,7 +88,7 @@ index 337aa29..c936219 100644 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java new file mode 100644 -index 0000000..eef9722 +index 0000000..18513a5 --- /dev/null +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -0,0 +1,141 @@ @@ -147,8 +147,8 @@ index 0000000..eef9722 + + commands = new HashMap(); + -+ version = getInt( "config-version", 7 ); -+ set( "config-version", 7 ); ++ version = getInt( "config-version", 8 ); ++ set( "config-version", 8 ); + readConfig( PaperSpigotConfig.class, null ); + } + @@ -317,5 +317,5 @@ index 0000000..f3bc3aa + } +} -- -2.4.1.windows.1 +1.9.5.msysgit.1 diff --git a/Spigot-Server-Patches/0017-Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/0017-Drop-falling-block-entities-that-are-above-the-speci.patch index 3bc316a37..79cf54a9c 100644 --- a/Spigot-Server-Patches/0017-Drop-falling-block-entities-that-are-above-the-speci.patch +++ b/Spigot-Server-Patches/0017-Drop-falling-block-entities-that-are-above-the-speci.patch @@ -1,4 +1,4 @@ -From c9860a2e12193e696b71bdab28696fd08e55ccce Mon Sep 17 00:00:00 2001 +From 996541c984eb8ce498be51cbc5fec44fe62c897d Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sat, 7 Mar 2015 22:03:47 -0600 Subject: [PATCH] Drop falling block entities that are above the specified @@ -28,10 +28,10 @@ index ce91553..ef93776 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 8d707f7..ebe0a4f 100644 +index 8d707f7..8cdd858 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -146,4 +146,14 @@ public class PaperSpigotWorldConfig +@@ -146,4 +146,56 @@ public class PaperSpigotWorldConfig keepSpawnInMemory = getBoolean( "keep-spawn-loaded", true ); log( "Keep spawn chunk loaded: " + keepSpawnInMemory ); } @@ -39,6 +39,48 @@ index 8d707f7..ebe0a4f 100644 + public int fallingBlockHeightNerf; + private void fallingBlockheightNerf() + { ++ // TODO: Remove migrations after most users have upgraded. ++ if ( PaperSpigotConfig.version < 8 ) ++ { ++ // Migrate default value ++ ++ int heightNerf = config.getInt( "world-settings.default.falling-block-height-nerf", 0 ); ++ if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings.default.tnt-entity-height-nerf", 0 ); ++ if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", 0 ); ++ if ( heightNerf != 0 ) config.set( "world-settings.default.falling-block-height-nerf", heightNerf ); ++ ++ if ( config.contains( "world-settings.default.tnt-entity-height-nerf" ) ) ++ { ++ config.getDefaults().set( "world-settings.default.tnt-entity-height-nerf", null ); ++ config.set( "world-settings.default.tnt-entity-height-nerf", null ); ++ } ++ ++ if ( config.contains( "world-settings.default.tnt-gameplay.tnt-entity-height-limit" ) ) ++ { ++ config.getDefaults().set( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", null ); ++ config.set( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", null ); ++ } ++ ++ // Migrate world setting ++ ++ heightNerf = config.getInt( "world-settings." + worldName + ".falling-block-height-nerf" ); ++ if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings." + worldName + ".tnt-entity-height-nerf", 0 ); ++ if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", 0 ); ++ if ( heightNerf != 0 ) config.set( "world-settings." + worldName + ".falling-block-height-nerf", heightNerf ); ++ ++ if ( config.contains( "world-settings." + worldName + ".tnt-entity-height-nerf" ) ) ++ { ++ config.getDefaults().set( "world-settings." + worldName + ".tnt-entity-height-nerf", null ); ++ config.set( "world-settings." + worldName + ".tnt-entity-height-nerf", null); ++ } ++ ++ if ( config.contains( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit" ) ) ++ { ++ config.getDefaults().set( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", null ); ++ config.set( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", null ); ++ } ++ } ++ + fallingBlockHeightNerf = getInt( "falling-block-height-nerf", 0 ); + if ( fallingBlockHeightNerf != 0 ) + { @@ -47,5 +89,5 @@ index 8d707f7..ebe0a4f 100644 + } } -- -1.9.1 +1.9.5.msysgit.1 diff --git a/Spigot-Server-Patches/0018-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0018-Configurable-speed-for-water-flowing-over-lava.patch index 35f6b1685..917350bd4 100644 --- a/Spigot-Server-Patches/0018-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0018-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,11 +1,11 @@ -From b4b6b413ad6ec16b1e9c236d8c78bca81a299e91 Mon Sep 17 00:00:00 2001 +From 87301edc13550f4968a6975fff8bdc99108d55a7 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sat, 7 Mar 2015 22:17:03 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 842a27a..449b12f 100644 +index 5d36af3..de1dddb 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -35,7 +35,7 @@ public class BlockFlowing extends BlockFluids { @@ -42,10 +42,10 @@ index 842a27a..449b12f 100644 + } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index ebe0a4f..41a80da 100644 +index 8cdd858..9c961d7 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -156,4 +156,11 @@ public class PaperSpigotWorldConfig +@@ -198,4 +198,11 @@ public class PaperSpigotWorldConfig log( "Falling Block Height Limit set to Y: " + fallingBlockHeightNerf ); } } @@ -58,5 +58,5 @@ index ebe0a4f..41a80da 100644 + } } -- -1.9.1 +1.9.5.msysgit.1 diff --git a/Spigot-Server-Patches/0022-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0022-Remove-invalid-mob-spawner-tile-entities.patch index 6e469fc36..e129fe2ec 100644 --- a/Spigot-Server-Patches/0022-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0022-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,4 +1,4 @@ -From fcfba0e0c4e6d55ab0625bcb2d5f157e75277a58 Mon Sep 17 00:00:00 2001 +From f4da307613f8297e8ed8560fe5cbfe65ee4ae0e5 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 8 Mar 2015 01:06:14 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities @@ -21,10 +21,10 @@ index d5922fe..ea61f59 100644 System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ() + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getType(blockposition)) + ") where there was no entity tile!"); diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 41a80da..31dedce 100644 +index 9c961d7..e1b9a6c 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -163,4 +163,11 @@ public class PaperSpigotWorldConfig +@@ -205,4 +205,11 @@ public class PaperSpigotWorldConfig waterOverLavaFlowSpeed = getInt( "water-over-lava-flow-speed", 5 ); log( "Water over lava flow speed: " + waterOverLavaFlowSpeed ); } @@ -37,5 +37,5 @@ index 41a80da..31dedce 100644 + } } -- -1.9.1 +1.9.5.msysgit.1 diff --git a/Spigot-Server-Patches/0026-Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/0026-Remove-certain-entities-that-fly-through-unloaded-ch.patch index b1091d985..f54915ffd 100644 --- a/Spigot-Server-Patches/0026-Remove-certain-entities-that-fly-through-unloaded-ch.patch +++ b/Spigot-Server-Patches/0026-Remove-certain-entities-that-fly-through-unloaded-ch.patch @@ -1,4 +1,4 @@ -From 7b735d8eaea7f21c2c18525ae2f603b729ac19ad Mon Sep 17 00:00:00 2001 +From 239a7bfece56045f4f17a3f762aeb075b1880c2c Mon Sep 17 00:00:00 2001 From: Iceee Date: Sun, 8 Mar 2015 03:34:15 -0500 Subject: [PATCH] Remove certain entities that fly through unloaded chunks @@ -97,10 +97,10 @@ index 67c739e..530e60f 100644 entity.tickTimer.startTiming(); // Spigot // CraftBukkit end diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 31dedce..ac02b90 100644 +index e1b9a6c..7804086 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -170,4 +170,14 @@ public class PaperSpigotWorldConfig +@@ -212,4 +212,14 @@ public class PaperSpigotWorldConfig removeInvalidMobSpawnerTEs = getBoolean( "remove-invalid-mob-spawner-tile-entities", true ); log( "Remove invalid mob spawner tile entities: " + removeInvalidMobSpawnerTEs ); } @@ -116,5 +116,5 @@ index 31dedce..ac02b90 100644 + } } -- -2.4.1.windows.1 +1.9.5.msysgit.1 diff --git a/Spigot-Server-Patches/0031-Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/0031-Configurable-game-mechanics-changes.patch index 836935efb..ede5cfe9c 100644 --- a/Spigot-Server-Patches/0031-Configurable-game-mechanics-changes.patch +++ b/Spigot-Server-Patches/0031-Configurable-game-mechanics-changes.patch @@ -1,4 +1,4 @@ -From 20d9994e0cf68e4fae68d2a5d8b0cefd871d42e7 Mon Sep 17 00:00:00 2001 +From 6c5e2e0b943ed4311fe1a44494f2adc860ca73df Mon Sep 17 00:00:00 2001 From: gsand Date: Sun, 8 Mar 2015 04:10:02 -0500 Subject: [PATCH] Configurable game mechanics changes @@ -63,10 +63,10 @@ index f6a43c0..0e6f8c0 100644 + } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index ac02b90..f33142a 100644 +index 7804086..9e2f4d1 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -180,4 +180,10 @@ public class PaperSpigotWorldConfig +@@ -222,4 +222,10 @@ public class PaperSpigotWorldConfig removeUnloadedTNTEntities = getBoolean( "remove-unloaded.tnt-entities", true ); removeUnloadedFallingBlocks = getBoolean( "remove-unloaded.falling-blocks", true ); } @@ -78,5 +78,5 @@ index ac02b90..f33142a 100644 + } } -- -2.4.1.windows.1 +1.9.5.msysgit.1 diff --git a/Spigot-Server-Patches/0036-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0036-Configurable-top-of-nether-void-damage.patch index 8d0069308..e7c0d27a2 100644 --- a/Spigot-Server-Patches/0036-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0036-Configurable-top-of-nether-void-damage.patch @@ -1,4 +1,4 @@ -From 656b4cb5ee5ec6dba6f69f3abfe48268565f0a0d Mon Sep 17 00:00:00 2001 +From d481a7ac79cc1e1e882a187979ce1151ce424297 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Feb 2015 14:57:28 -0600 Subject: [PATCH] Configurable top of nether void damage @@ -32,10 +32,10 @@ index 1470c21..79837ef 100644 } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index f33142a..a6d8532 100644 +index 9e2f4d1..e0926a2 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -186,4 +186,10 @@ public class PaperSpigotWorldConfig +@@ -228,4 +228,10 @@ public class PaperSpigotWorldConfig { boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false ); } @@ -47,5 +47,5 @@ index f33142a..a6d8532 100644 + } } -- -2.4.1.windows.1 +1.9.5.msysgit.1 diff --git a/Spigot-Server-Patches/0039-Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/0039-Fix-redstone-lag-issues.patch index 27b74aa1d..c761f8477 100644 --- a/Spigot-Server-Patches/0039-Fix-redstone-lag-issues.patch +++ b/Spigot-Server-Patches/0039-Fix-redstone-lag-issues.patch @@ -1,4 +1,4 @@ -From beee34f74449648f71aed69681ccfb448156534c Mon Sep 17 00:00:00 2001 +From 731e657bf28c20f22e0efa05cf1cc9664374e9e8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 13 Apr 2015 15:47:15 -0500 Subject: [PATCH] Fix redstone lag issues @@ -54,10 +54,10 @@ index d76b965..7624984 100644 this.methodProfiler.a("ticking"); Iterator iterator = this.V.iterator(); diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index a6d8532..134d43b 100644 +index e0926a2..bcd8b65 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -192,4 +192,14 @@ public class PaperSpigotWorldConfig +@@ -234,4 +234,14 @@ public class PaperSpigotWorldConfig { netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false ); } diff --git a/Spigot-Server-Patches/0042-Configurable-async-light-updates.patch b/Spigot-Server-Patches/0042-Configurable-async-light-updates.patch index dcdb790a2..d4ae2228b 100644 --- a/Spigot-Server-Patches/0042-Configurable-async-light-updates.patch +++ b/Spigot-Server-Patches/0042-Configurable-async-light-updates.patch @@ -1,4 +1,4 @@ -From 2207bdc6f09a92810a4b02fb72383c89eeab32bc Mon Sep 17 00:00:00 2001 +From 5b687e8dda6c3791536ae533422d02ac55ea960f Mon Sep 17 00:00:00 2001 From: Roman Alexander Date: Wed, 25 Mar 2015 20:27:13 -0500 Subject: [PATCH] Configurable async light updates @@ -333,10 +333,10 @@ index 51e59c0..86913f4 100644 public boolean a(boolean flag) { return false; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 134d43b..0bf4d21 100644 +index bcd8b65..fa9ae6c 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -202,4 +202,11 @@ public class PaperSpigotWorldConfig +@@ -244,4 +244,11 @@ public class PaperSpigotWorldConfig log( "WorldServer TickNextTick cap set at " + tickNextTickCap ); log( "WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone ); } diff --git a/Spigot-Server-Patches/0043-Optimize-draining.patch b/Spigot-Server-Patches/0043-Optimize-draining.patch index e5d994206..3270a094f 100644 --- a/Spigot-Server-Patches/0043-Optimize-draining.patch +++ b/Spigot-Server-Patches/0043-Optimize-draining.patch @@ -1,4 +1,4 @@ -From 36ace97ecfaceaac3b26402c8f8b53ce6ec2f4ab Mon Sep 17 00:00:00 2001 +From ed48841ba8e3f699ca3b15f36b15030882e1f012 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Fri, 10 Apr 2015 02:24:20 -0700 Subject: [PATCH] Optimize draining @@ -29,10 +29,10 @@ index de1dddb..d8de1fc 100644 } } else { diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 0bf4d21..2375379 100644 +index fa9ae6c..f11ca71 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -209,4 +209,10 @@ public class PaperSpigotWorldConfig +@@ -251,4 +251,10 @@ public class PaperSpigotWorldConfig useAsyncLighting = getBoolean( "use-async-lighting", false ); log( "World async lighting: " + useAsyncLighting ); } diff --git a/Spigot-Server-Patches/0044-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0044-Toggleable-player-crits-helps-mitigate-hacked-client.patch index fd60fee63..3032bdabd 100644 --- a/Spigot-Server-Patches/0044-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0044-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,4 +1,4 @@ -From 7a2369a343236adfdff897ba935f75033b504c53 Mon Sep 17 00:00:00 2001 +From 365e3440181bcd076813df0cb45f8a6b30ec72a3 Mon Sep 17 00:00:00 2001 From: Roman Alexander Date: Fri, 27 Mar 2015 00:52:24 -0400 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. @@ -18,10 +18,10 @@ index 8d2b3a1..961b53b 100644 if (flag && f > 0.0F) { f *= 1.5F; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 2375379..acbe522 100644 +index f11ca71..3c011c2 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -182,9 +182,11 @@ public class PaperSpigotWorldConfig +@@ -224,9 +224,11 @@ public class PaperSpigotWorldConfig } public boolean boatsDropBoats; diff --git a/Spigot-Server-Patches/0048-Configurable-end-credits-when-leaving-the-end.patch b/Spigot-Server-Patches/0048-Configurable-end-credits-when-leaving-the-end.patch index 1efd40b4c..38222d8d5 100644 --- a/Spigot-Server-Patches/0048-Configurable-end-credits-when-leaving-the-end.patch +++ b/Spigot-Server-Patches/0048-Configurable-end-credits-when-leaving-the-end.patch @@ -1,4 +1,4 @@ -From c2d3f2f244f11d21bd24127faafb878faff07a27 Mon Sep 17 00:00:00 2001 +From 5257c2152e280fff97b350cc909373afc16586d9 Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Thu, 28 May 2015 20:12:38 -0500 Subject: [PATCH] Configurable end credits when leaving the end @@ -74,10 +74,10 @@ index f4f78e8..fac50e4 100644 return; } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index acbe522..4d16fa7 100644 +index 3c011c2..e14e961 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -217,4 +217,10 @@ public class PaperSpigotWorldConfig +@@ -259,4 +259,10 @@ public class PaperSpigotWorldConfig { optimizeDraining = getBoolean( "optimize-draining", false ); } diff --git a/Spigot-Server-Patches/0049-Force-load-chunks-for-specific-entities-that-fly-thr.patch b/Spigot-Server-Patches/0049-Force-load-chunks-for-specific-entities-that-fly-thr.patch index e84da9f88..b29601eec 100644 --- a/Spigot-Server-Patches/0049-Force-load-chunks-for-specific-entities-that-fly-thr.patch +++ b/Spigot-Server-Patches/0049-Force-load-chunks-for-specific-entities-that-fly-thr.patch @@ -1,4 +1,4 @@ -From 8a9a9c387f3eef8338ed3d8e9d89dfc0b10a7349 Mon Sep 17 00:00:00 2001 +From 20ef67da6f0df0601f190b8809d6a7a7176201c2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 May 2015 22:01:25 -0500 Subject: [PATCH] Force load chunks for specific entities that fly through @@ -126,10 +126,10 @@ index 86913f4..385d742 100644 entity.ad = false; } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 4d16fa7..fd2174a 100644 +index e14e961..f51962e 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -223,4 +223,14 @@ public class PaperSpigotWorldConfig +@@ -265,4 +265,14 @@ public class PaperSpigotWorldConfig { disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false ); } diff --git a/Spigot-Server-Patches/0053-Generator-Settings.patch b/Spigot-Server-Patches/0053-Generator-Settings.patch index b92e03cdd..1bf0196f5 100644 --- a/Spigot-Server-Patches/0053-Generator-Settings.patch +++ b/Spigot-Server-Patches/0053-Generator-Settings.patch @@ -1,4 +1,4 @@ -From 5e05406190489a48b24d722dbf117e7e33d6d3bf Mon Sep 17 00:00:00 2001 +From d3ce5089173313a357823c89c3d000244f1fc8b7 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 2 Jun 2015 00:41:23 -0700 Subject: [PATCH] Generator Settings @@ -243,10 +243,10 @@ index 0f8211a..e76acfc 100644 Iterator iterator = this.e.values().iterator(); diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index fd2174a..f50eb1f 100644 +index f51962e..8338cc6 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -@@ -233,4 +233,28 @@ public class PaperSpigotWorldConfig +@@ -275,4 +275,28 @@ public class PaperSpigotWorldConfig loadUnloadedTNTEntities = getBoolean( "load-chunks.tnt-entities", false ); loadUnloadedFallingBlocks = getBoolean( "load-chunks.falling-blocks", false ); }