Paper-Old/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch

From c3d01d0c1a1da22dca1cc88fa0cc6457e4227e93 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 2 Sep 2018 19:34:33 -0700
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 chunks


diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d74ec389a..c0dca07b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -498,7 +498,7 @@ public class CraftWorld implements World {
     @Override
     public boolean loadChunk(int x, int z, boolean generate) {
         org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
-        IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
+        IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
 
         // If generate = false, but the chunk already exists, we will get this back.
         if (chunk instanceof ProtoChunkExtension) {
-- 
2.23.0
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ff0672ca SPIGOT-5211: Add Raid API CraftBukkit Changes: 96bc85f0 SPIGOT-5298: Remove unexplained 0.1 drop chance offset 6ed8a189 SPIGOT-5290: Invulnerable and/or Marker armor stand triggers EntityDamageEvent 631eaeb0 SPIGOT-5297: PlayerBedLeaveEvent.getBed() returns player location 8d4bc541 SPIGOT-5293: Sponge behaviour differs from Vanilla e91fd75e SPIGOT-5291: Missing event for ravagers trampling crops cbdd7139 SPIGOT-5211: Add Raid API edd8fdfb SPIGOT-5287: Fix rare CME generating new chunks 3fc97f08 SPIGOT-5265: FireworkExplodeEvent only fired when rockets explode in air Spigot Changes: 065a3734 Rebuild patches a5961826 SPIGOT-5286: tick-inactive-villagers invokes the AI for NoAI villagers 2019-08-31 21:30:44 +02:00			`From c3d01d0c1a1da22dca1cc88fa0cc6457e4227e93 Mon Sep 17 00:00:00 2001`
Revert "All generated chunks should be loadable" - Fixes #1470 This reverts commit 60b1ed9c763f8808ca8ab0c408f4c9591fd6f2d1. 2018-09-22 17:32:38 +02:00			`From: Spottedleaf <Spottedleaf@users.noreply.github.com>`
			`Date: Sun, 2 Sep 2018 19:34:33 -0700`
			`Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted`
			`chunks`


			`diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ff0672ca SPIGOT-5211: Add Raid API CraftBukkit Changes: 96bc85f0 SPIGOT-5298: Remove unexplained 0.1 drop chance offset 6ed8a189 SPIGOT-5290: Invulnerable and/or Marker armor stand triggers EntityDamageEvent 631eaeb0 SPIGOT-5297: PlayerBedLeaveEvent.getBed() returns player location 8d4bc541 SPIGOT-5293: Sponge behaviour differs from Vanilla e91fd75e SPIGOT-5291: Missing event for ravagers trampling crops cbdd7139 SPIGOT-5211: Add Raid API edd8fdfb SPIGOT-5287: Fix rare CME generating new chunks 3fc97f08 SPIGOT-5265: FireworkExplodeEvent only fired when rockets explode in air Spigot Changes: 065a3734 Rebuild patches a5961826 SPIGOT-5286: tick-inactive-villagers invokes the AI for NoAI villagers 2019-08-31 21:30:44 +02:00			`index d74ec389a..c0dca07b6 100644`
Revert "All generated chunks should be loadable" - Fixes #1470 This reverts commit 60b1ed9c763f8808ca8ab0c408f4c9591fd6f2d1. 2018-09-22 17:32:38 +02:00			`--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java`
			`+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ff0672ca SPIGOT-5211: Add Raid API CraftBukkit Changes: 96bc85f0 SPIGOT-5298: Remove unexplained 0.1 drop chance offset 6ed8a189 SPIGOT-5290: Invulnerable and/or Marker armor stand triggers EntityDamageEvent 631eaeb0 SPIGOT-5297: PlayerBedLeaveEvent.getBed() returns player location 8d4bc541 SPIGOT-5293: Sponge behaviour differs from Vanilla e91fd75e SPIGOT-5291: Missing event for ravagers trampling crops cbdd7139 SPIGOT-5211: Add Raid API edd8fdfb SPIGOT-5287: Fix rare CME generating new chunks 3fc97f08 SPIGOT-5265: FireworkExplodeEvent only fired when rockets explode in air Spigot Changes: 065a3734 Rebuild patches a5961826 SPIGOT-5286: tick-inactive-villagers invokes the AI for NoAI villagers 2019-08-31 21:30:44 +02:00			`@@ -498,7 +498,7 @@ public class CraftWorld implements World {`
Update Upstream 2019-05-06 04:58:04 +02:00			`@Override`
Revert "All generated chunks should be loadable" - Fixes #1470 This reverts commit 60b1ed9c763f8808ca8ab0c408f4c9591fd6f2d1. 2018-09-22 17:32:38 +02:00			`public boolean loadChunk(int x, int z, boolean generate) {`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c987938a SPIGOT-5180: Add Villager#sleep() and #wakeup() methods CraftBukkit Changes: 7f33c6a2 SPIGOT-5196: Restore previous version behaviour regarding cancelled BlockBreakEvent 6a5fc902 Improve diff in EntityHanging c98d61bf SPIGOT-4712: Allow spawning of upwards or downwards facing item frames db971477 SPIGOT-5199: Fix NPE if setting the book of the ItemMeta of a lectern b0ef3996 SPIGOT-4679 Fix black lines after book paragraphs 1215188f SPIGOT-5180: Add Villager#sleep() and #wakeup() methods c03b2bef SPIGOT-4975: NPE on WorldGenStronghold When Using Multiple Worlds 65ea162c Ensure Bukkit data pack is always up to date 0b107b8d MC-157395, SPIGOT-5193: Small armor stands do not drop loot 6da0abca SPIGOT-5195: Player loot table does not drop when keepInventory is on 8b09d983 SPIGOT-5190: Superfluous EntityCombustEvent called when using fire aspect sword Spigot Changes: 1981d553 SPIGOT-5198: Catch more bad async operations 6a14ca46 Rebuild patches 2019-07-23 21:17:32 +02:00			`org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot`
More patches for 1.14 2019-05-05 10:33:44 +02:00			`- IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: c987938a SPIGOT-5180: Add Villager#sleep() and #wakeup() methods CraftBukkit Changes: 7f33c6a2 SPIGOT-5196: Restore previous version behaviour regarding cancelled BlockBreakEvent 6a5fc902 Improve diff in EntityHanging c98d61bf SPIGOT-4712: Allow spawning of upwards or downwards facing item frames db971477 SPIGOT-5199: Fix NPE if setting the book of the ItemMeta of a lectern b0ef3996 SPIGOT-4679 Fix black lines after book paragraphs 1215188f SPIGOT-5180: Add Villager#sleep() and #wakeup() methods c03b2bef SPIGOT-4975: NPE on WorldGenStronghold When Using Multiple Worlds 65ea162c Ensure Bukkit data pack is always up to date 0b107b8d MC-157395, SPIGOT-5193: Small armor stands do not drop loot 6da0abca SPIGOT-5195: Player loot table does not drop when keepInventory is on 8b09d983 SPIGOT-5190: Superfluous EntityCombustEvent called when using fire aspect sword Spigot Changes: 1981d553 SPIGOT-5198: Catch more bad async operations 6a14ca46 Rebuild patches 2019-07-23 21:17:32 +02:00			`+ IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate \|\| isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper`
Revert "All generated chunks should be loadable" - Fixes #1470 This reverts commit 60b1ed9c763f8808ca8ab0c408f4c9591fd6f2d1. 2018-09-22 17:32:38 +02:00
More patches for 1.14 2019-05-05 10:33:44 +02:00			`// If generate = false, but the chunk already exists, we will get this back.`
			`if (chunk instanceof ProtoChunkExtension) {`
Revert "All generated chunks should be loadable" - Fixes #1470 This reverts commit 60b1ed9c763f8808ca8ab0c408f4c9591fd6f2d1. 2018-09-22 17:32:38 +02:00			`--`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ff0672ca SPIGOT-5211: Add Raid API CraftBukkit Changes: 96bc85f0 SPIGOT-5298: Remove unexplained 0.1 drop chance offset 6ed8a189 SPIGOT-5290: Invulnerable and/or Marker armor stand triggers EntityDamageEvent 631eaeb0 SPIGOT-5297: PlayerBedLeaveEvent.getBed() returns player location 8d4bc541 SPIGOT-5293: Sponge behaviour differs from Vanilla e91fd75e SPIGOT-5291: Missing event for ravagers trampling crops cbdd7139 SPIGOT-5211: Add Raid API edd8fdfb SPIGOT-5287: Fix rare CME generating new chunks 3fc97f08 SPIGOT-5265: FireworkExplodeEvent only fired when rockets explode in air Spigot Changes: 065a3734 Rebuild patches a5961826 SPIGOT-5286: tick-inactive-villagers invokes the AI for NoAI villagers 2019-08-31 21:30:44 +02:00			`2.23.0`
Revert "All generated chunks should be loadable" - Fixes #1470 This reverts commit 60b1ed9c763f8808ca8ab0c408f4c9591fd6f2d1. 2018-09-22 17:32:38 +02:00