From e2418a9945376e468a194abcfdaaf38f45b02265 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 4 Oct 2018 23:31:01 -0400 Subject: [PATCH] [CI-SKIP] Undo an accidental merger of patches Accidently merged 1 pathfinding patch into a light patch instead of the other pathfinding page. Fixed that. Hand editting patch master race --- ...-Do-not-load-chunks-for-Pathfinding.patch} | 31 +++++++++---------- ...-Do-not-load-chunks-for-light-checks.patch | 23 ++++++++++++++ ...091-Add-PlayerUseUnknownEntityEvent.patch} | 2 +- ...DebugInfo-not-initialized-on-client.patch} | 4 +-- ...Configurable-Grass-Spread-Tick-Rate.patch} | 2 +- ...e-Keep-Spawn-Loaded-range-per-world.patch} | 2 +- ...-BlockPlaceEvent-triggering-physics.patch} | 2 +- ...m-reload-spawn-chunks-in-nether-end.patch} | 2 +- ...7-Remove-Debug-checks-from-DataBits.patch} | 2 +- ...illa-per-world-scoreboard-coloring-.patch} | 2 +- ...d-for-setting-passengers-on-players.patch} | 2 +- ...emove-unused-World-Tile-Entity-List.patch} | 2 +- ... 0101-Don-t-tick-Skulls-unused-code.patch} | 2 +- ... 0102-Configurable-Player-Collision.patch} | 10 +++--- ...nt-to-allow-plugins-to-handle-clien.patch} | 2 +- ...> 0104-Configurable-RCON-IP-address.patch} | 2 +- ...05-Prevent-Fire-from-loading-chunks.patch} | 2 +- ...6-Implement-PlayerLocaleChangeEvent.patch} | 2 +- ...tyRegainHealthEvent-isFastRegen-API.patch} | 2 +- ...to-configure-frosted_ice-properties.patch} | 2 +- ...possibility-for-getServer-singleton.patch} | 2 +- ...tem-frames-performance-and-bug-fixe.patch} | 2 +- ...1-Do-not-load-chunks-for-pathfinding.patch | 22 ------------- ...API-Replenishable-Lootables-Feature.patch} | 2 +- 24 files changed, 64 insertions(+), 64 deletions(-) rename Spigot-Server-Patches/{0089-Do-not-load-chunks-for-light-checks.patch => 0089-Do-not-load-chunks-for-Pathfinding.patch} (87%) create mode 100644 Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch rename Spigot-Server-Patches/{0090-Add-PlayerUseUnknownEntityEvent.patch => 0091-Add-PlayerUseUnknownEntityEvent.patch} (96%) rename Spigot-Server-Patches/{0091-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0092-Fix-reducedDebugInfo-not-initialized-on-client.patch} (91%) rename Spigot-Server-Patches/{0092-Configurable-Grass-Spread-Tick-Rate.patch => 0093-Configurable-Grass-Spread-Tick-Rate.patch} (96%) rename Spigot-Server-Patches/{0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (98%) rename Spigot-Server-Patches/{0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (93%) rename Spigot-Server-Patches/{0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (96%) rename Spigot-Server-Patches/{0096-Remove-Debug-checks-from-DataBits.patch => 0097-Remove-Debug-checks-from-DataBits.patch} (96%) rename Spigot-Server-Patches/{0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (97%) rename Spigot-Server-Patches/{0098-Workaround-for-setting-passengers-on-players.patch => 0099-Workaround-for-setting-passengers-on-players.patch} (94%) rename Spigot-Server-Patches/{0099-Remove-unused-World-Tile-Entity-List.patch => 0100-Remove-unused-World-Tile-Entity-List.patch} (98%) rename Spigot-Server-Patches/{0100-Don-t-tick-Skulls-unused-code.patch => 0101-Don-t-tick-Skulls-unused-code.patch} (92%) rename Spigot-Server-Patches/{0101-Configurable-Player-Collision.patch => 0102-Configurable-Player-Collision.patch} (96%) rename Spigot-Server-Patches/{0102-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%) rename Spigot-Server-Patches/{0103-Configurable-RCON-IP-address.patch => 0104-Configurable-RCON-IP-address.patch} (94%) rename Spigot-Server-Patches/{0104-Prevent-Fire-from-loading-chunks.patch => 0105-Prevent-Fire-from-loading-chunks.patch} (97%) rename Spigot-Server-Patches/{0105-Implement-PlayerLocaleChangeEvent.patch => 0106-Implement-PlayerLocaleChangeEvent.patch} (98%) rename Spigot-Server-Patches/{0106-EntityRegainHealthEvent-isFastRegen-API.patch => 0107-EntityRegainHealthEvent-isFastRegen-API.patch} (97%) rename Spigot-Server-Patches/{0107-Add-ability-to-configure-frosted_ice-properties.patch => 0108-Add-ability-to-configure-frosted_ice-properties.patch} (98%) rename Spigot-Server-Patches/{0108-remove-null-possibility-for-getServer-singleton.patch => 0109-remove-null-possibility-for-getServer-singleton.patch} (96%) rename Spigot-Server-Patches/{0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (99%) delete mode 100644 Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch rename Spigot-Server-Patches/{0110-LootTable-API-Replenishable-Lootables-Feature.patch => 0111-LootTable-API-Replenishable-Lootables-Feature.patch} (99%) diff --git a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch similarity index 87% rename from Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch rename to Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch index 05d32e79c3..e66a5c0421 100644 --- a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch @@ -1,11 +1,22 @@ -From 19bc80177637e62f6abf6e8422fb97663e2bd524 Mon Sep 17 00:00:00 2001 +From d8f79a7c0c289ac8d6ca3fd0e9c9be164ea452c5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 -Subject: [PATCH] Do not load chunks for light checks +Subject: [PATCH] Do not load chunks for Pathfinding -Should only happen for blocks on the edge that uses neighbors light level -(certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. +diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java +index ff740bc1a7..78adbf9062 100644 +--- a/src/main/java/net/minecraft/server/ChunkCache.java ++++ b/src/main/java/net/minecraft/server/ChunkCache.java +@@ -21,7 +21,7 @@ public class ChunkCache implements IIBlockAccess { + + for(int l = this.a; l <= j; ++l) { + for(int i1 = this.b; i1 <= k; ++i1) { +- this.c[l - this.a][i1 - this.b] = world.getChunkAt(l, i1); ++ this.c[l - this.a][i1 - this.b] = world.getChunkIfLoaded(l, i1); // Paper + } + } + diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java index a8b070ed32..7a4bc0fcc3 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -122,18 +133,6 @@ index 64e0b08170..93f3d2e363 100644 Block block = iblockdata.getBlock(); Material material = iblockdata.getMaterial(); if (iblockdata.isAir()) { -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 207f53a9c3..b8fcfb6092 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -663,6 +663,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc - if (blockposition.getY() >= 256) { - blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ()); - } -+ if (!this.isLoaded(blockposition)) return 0; // Paper - - return this.getChunkAtWorldCoords(blockposition).a(blockposition, i); - } -- 2.19.0 diff --git a/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch new file mode 100644 index 0000000000..787b9da281 --- /dev/null +++ b/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch @@ -0,0 +1,23 @@ +From 745b9a840a5cd1abf190a93a673f174d0c39aa3b Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Thu, 31 Mar 2016 19:17:58 -0400 +Subject: [PATCH] Do not load chunks for light checks + +Should only happen for blocks on the edge that uses neighbors light level +(certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 207f53a9c3..b8fcfb6092 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -663,6 +663,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc + if (blockposition.getY() >= 256) { + blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ()); + } ++ if (!this.isLoaded(blockposition)) return 0; // Paper + + return this.getChunkAtWorldCoords(blockposition).a(blockposition, i); + } +-- +2.19.0 + diff --git a/Spigot-Server-Patches/0090-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch similarity index 96% rename from Spigot-Server-Patches/0090-Add-PlayerUseUnknownEntityEvent.patch rename to Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch index 95feecff23..a09b94219b 100644 --- a/Spigot-Server-Patches/0090-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 43cd905fa897553b08251ada854025047bc63f6d Mon Sep 17 00:00:00 2001 +From 5022f9e018267160b070c24bd0578fe6f0013692 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/Spigot-Server-Patches/0091-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch similarity index 91% rename from Spigot-Server-Patches/0091-Fix-reducedDebugInfo-not-initialized-on-client.patch rename to Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch index 2f7b57d123..1084ebf72b 100644 --- a/Spigot-Server-Patches/0091-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,11 +1,11 @@ -From a8396718f64ff043cf49da5e9056902cf50ce9d5 Mon Sep 17 00:00:00 2001 +From ef9ed246bbbed57972d8592aebb841a80a66365d Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9f2c7d3f45..8121f8e40a 100644 +index 7dfb2bee49..2154c0516c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -162,6 +162,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0092-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch similarity index 96% rename from Spigot-Server-Patches/0092-Configurable-Grass-Spread-Tick-Rate.patch rename to Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch index ed97cfeef1..d43f517b13 100644 --- a/Spigot-Server-Patches/0092-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,4 +1,4 @@ -From dc7aac4fbfb58430d712ad94f241daaab090468c Mon Sep 17 00:00:00 2001 +From 7bbf9d567a6939c784f7cc7ba40a6900e43fff54 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/Spigot-Server-Patches/0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 98% rename from Spigot-Server-Patches/0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 90b5a331d7..656f9f10fe 100644 --- a/Spigot-Server-Patches/0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From ba5a11cd178572ea41951140c92c56790a210921 Mon Sep 17 00:00:00 2001 +From 19bce9bdfcc2862adc935166689dd5cb4c1cfd0f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world diff --git a/Spigot-Server-Patches/0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 93% rename from Spigot-Server-Patches/0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 5b3caba720..ef46f39624 100644 --- a/Spigot-Server-Patches/0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,4 +1,4 @@ -From 25a25007f6f5bd564e33ff440b2d81fbcc136649 Mon Sep 17 00:00:00 2001 +From 95a720901fee2ac8a6f18c047d98cc7a12c98f22 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/Spigot-Server-Patches/0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch similarity index 96% rename from Spigot-Server-Patches/0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch rename to Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch index fcfac85987..50a856bbb9 100644 --- a/Spigot-Server-Patches/0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -1,4 +1,4 @@ -From dcc23b7c3d5bef992833093cc60898dee23f8662 Mon Sep 17 00:00:00 2001 +From ee3d42118720a0a3751847a60457ba75cccf6d0d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 19:42:22 -0400 Subject: [PATCH] Don't spam reload spawn chunks in nether/end diff --git a/Spigot-Server-Patches/0096-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch similarity index 96% rename from Spigot-Server-Patches/0096-Remove-Debug-checks-from-DataBits.patch rename to Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch index eb8f398cdc..5f8f3d089f 100644 --- a/Spigot-Server-Patches/0096-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From 369b5037160e7332a95789009a028599834eb2fb Mon Sep 17 00:00:00 2001 +From fb3fb94a0ae6670121707f295837a53cc0fd0127 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits diff --git a/Spigot-Server-Patches/0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 97% rename from Spigot-Server-Patches/0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index 64afc9b7ab..99db97868f 100644 --- a/Spigot-Server-Patches/0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From be604d180094b2596fee95c693f438ff7c5f7f2d Mon Sep 17 00:00:00 2001 +From 96c24465ced08e0ea6b29a38191a7e68b5673ba7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names diff --git a/Spigot-Server-Patches/0098-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch similarity index 94% rename from Spigot-Server-Patches/0098-Workaround-for-setting-passengers-on-players.patch rename to Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch index e4343e79d6..5202495aca 100644 --- a/Spigot-Server-Patches/0098-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 0d433f35b10d9e6ee6a85e5f7bce2797096c5cc1 Mon Sep 17 00:00:00 2001 +From b13e3ba091cb6b577876dc9e7ee44ab7b96081b1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players diff --git a/Spigot-Server-Patches/0099-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch similarity index 98% rename from Spigot-Server-Patches/0099-Remove-unused-World-Tile-Entity-List.patch rename to Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch index 7f34f5cd3c..48241e3b78 100644 --- a/Spigot-Server-Patches/0099-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 46c4520fc8ce86b6c7406c19624ef3ac8aa02ba5 Mon Sep 17 00:00:00 2001 +From 84c22db34d740ea9f31baf1a34e55da2991b00dc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List diff --git a/Spigot-Server-Patches/0100-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch similarity index 92% rename from Spigot-Server-Patches/0100-Don-t-tick-Skulls-unused-code.patch rename to Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch index b91ed89775..aa3f9b27b7 100644 --- a/Spigot-Server-Patches/0100-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch @@ -1,4 +1,4 @@ -From 8039d15ff0deb8967a880ed84c71c85ad745e058 Mon Sep 17 00:00:00 2001 +From b71c6bf65574ea7877e1293d8fdf950947ec0507 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code diff --git a/Spigot-Server-Patches/0101-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch similarity index 96% rename from Spigot-Server-Patches/0101-Configurable-Player-Collision.patch rename to Spigot-Server-Patches/0102-Configurable-Player-Collision.patch index 9c0f164aab..fe7e316779 100644 --- a/Spigot-Server-Patches/0101-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch @@ -1,11 +1,11 @@ -From dadab125dda108756e38e52b5b3357370c1dd3c4 Mon Sep 17 00:00:00 2001 +From 021d6a7e4b90772f02a126500d0fe4d209f022b7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index db5770ef..233e7c64 100644 +index db5770ef14..233e7c64ad 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -224,4 +224,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index db5770ef..233e7c64 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8056dc40..74c84dda 100644 +index 8056dc40df..74c84dda69 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -425,6 +425,19 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -43,7 +43,7 @@ index 8056dc40..74c84dda 100644 protected void a(File file, WorldData worlddata) { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java -index f7a9b9d8..7befd80c 100644 +index f7a9b9d885..7befd80cf5 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java @@ -92,7 +92,7 @@ public class PacketPlayOutScoreboardTeam implements Packet Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/Spigot-Server-Patches/0103-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch similarity index 94% rename from Spigot-Server-Patches/0103-Configurable-RCON-IP-address.patch rename to Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch index c9a4130d1b..0a2a963dfa 100644 --- a/Spigot-Server-Patches/0103-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From cb1af7a80ad9f9d6520c17f799c27b84242efbab Mon Sep 17 00:00:00 2001 +From 24629d8216ef7f94026a4c062775768a7463683f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address diff --git a/Spigot-Server-Patches/0104-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch similarity index 97% rename from Spigot-Server-Patches/0104-Prevent-Fire-from-loading-chunks.patch rename to Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch index 8ab69a29da..e2f0660e16 100644 --- a/Spigot-Server-Patches/0104-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 57322090640350505e3ab9d6e5950835a484c880 Mon Sep 17 00:00:00 2001 +From 71e0dac70fbb70261b7d5f29382847a068fbf9d9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks diff --git a/Spigot-Server-Patches/0105-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch similarity index 98% rename from Spigot-Server-Patches/0105-Implement-PlayerLocaleChangeEvent.patch rename to Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch index e1a04c19e4..3f4b7a0d0d 100644 --- a/Spigot-Server-Patches/0105-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 5dd475cfe420792cb067c5c28ccfb0b2bb79c9e2 Mon Sep 17 00:00:00 2001 +From 383d8db44e3749821a3542ef8077f2ae8dd8c639 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/Spigot-Server-Patches/0106-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 97% rename from Spigot-Server-Patches/0106-EntityRegainHealthEvent-isFastRegen-API.patch rename to Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch index bc42efeefd..0861663475 100644 --- a/Spigot-Server-Patches/0106-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 213af17f91d3ef8cb0685afe67ba8e45779e3bdf Mon Sep 17 00:00:00 2001 +From 2bea46eadc94b15e1ccb5dbfe4c6ae78c33daf16 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/Spigot-Server-Patches/0107-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch similarity index 98% rename from Spigot-Server-Patches/0107-Add-ability-to-configure-frosted_ice-properties.patch rename to Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch index 0d7deca090..cb7becb81a 100644 --- a/Spigot-Server-Patches/0107-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,4 +1,4 @@ -From 16527a0ec911199ac7ee943708d9997ca81b08ba Mon Sep 17 00:00:00 2001 +From 86865ac2701a1c6e8db4e3f4ec3ac848656b2ca1 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/Spigot-Server-Patches/0108-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch similarity index 96% rename from Spigot-Server-Patches/0108-remove-null-possibility-for-getServer-singleton.patch rename to Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch index 37f57f5455..d69dd8313f 100644 --- a/Spigot-Server-Patches/0108-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From cfde7861f93d5d001dd84ec0490eb709c46e60dc Mon Sep 17 00:00:00 2001 +From 2d8a85df7a2943eb4c852bfdd9e0e06cb1a86864 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton diff --git a/Spigot-Server-Patches/0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 99% rename from Spigot-Server-Patches/0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 612effcd98..e18d57596f 100644 --- a/Spigot-Server-Patches/0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From dc406506a9d9d30fd97e81991e7bd4974250223e Mon Sep 17 00:00:00 2001 +From f9a4f6c9d88b8c4a95936a8597507bbed44b19ca Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes diff --git a/Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch deleted file mode 100644 index 34da44c6be..0000000000 --- a/Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch +++ /dev/null @@ -1,22 +0,0 @@ -From bc7f6e6e280068fc1cacb38f0fcca0902efe0597 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Tue, 19 Jan 2016 00:13:19 -0500 -Subject: [PATCH] Do not load chunks for pathfinding - - -diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index ff740bc1a7..78adbf9062 100644 ---- a/src/main/java/net/minecraft/server/ChunkCache.java -+++ b/src/main/java/net/minecraft/server/ChunkCache.java -@@ -21,7 +21,7 @@ public class ChunkCache implements IIBlockAccess { - - for(int l = this.a; l <= j; ++l) { - for(int i1 = this.b; i1 <= k; ++i1) { -- this.c[l - this.a][i1 - this.b] = world.getChunkAt(l, i1); -+ this.c[l - this.a][i1 - this.b] = world.getChunkIfLoaded(l, i1); // Paper - } - } - --- -2.19.0 - diff --git a/Spigot-Server-Patches/0110-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 99% rename from Spigot-Server-Patches/0110-LootTable-API-Replenishable-Lootables-Feature.patch rename to Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch index fceaca5b11..0e598c917b 100644 --- a/Spigot-Server-Patches/0110-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From f4c7b9955bc7319b2dcc07d7037ee8f860758a4c Mon Sep 17 00:00:00 2001 +From ee11206efc611cd41bc39f6d33f8cc9092449b3a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature