diff options
| author | Shane Freeder <[email protected]> | 2019-10-08 19:37:02 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-10-08 19:37:02 +0100 |
| commit | e8c82f4eeeb511b7bfa974ddd2cc5d58779c8805 (patch) | |
| tree | 44e7a69e5237a3deaa6469ace9335ff16d7a5461 /Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch | |
| parent | 3398704d7f25f1efa91b06f5f211571706afd3da (diff) | |
| download | Paper-e8c82f4eeeb511b7bfa974ddd2cc5d58779c8805.tar.gz Paper-e8c82f4eeeb511b7bfa974ddd2cc5d58779c8805.zip | |
Updated Upstream (Bukkit/CraftBukkit)
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:
0399d9d6 SPIGOT-5341: Add Material.isAir
547f5709 SPIGOT-5353: Expand explosion API by adding source entity
CraftBukkit Changes:
7deb3728 SPIGOT-5309: Call cancelled EntityDamageEvent when damaging invisible armor stands
46351e17 SPIGOT-5341: Add Material.isAir
683bae06 SPIGOT-5342: Lore lost when deserializing items with no version stored
c2d12011 SPIGOT-5353: Expand explosion API by adding source entity
Diffstat (limited to 'Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch')
| -rw-r--r-- | Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index 09fc97307e..d5a37fc382 100644 --- a/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From c3d01d0c1a1da22dca1cc88fa0cc6457e4227e93 Mon Sep 17 00:00:00 2001 +From 07d2c1580badd47e46be14fd4d9f1cad5704b3fd Mon Sep 17 00:00:00 2001 From: Spottedleaf <[email protected]> Date: Sun, 2 Sep 2018 19:34:33 -0700 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted @@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d74ec389a..c0dca07b6 100644 +index f57023529d..dc0a07c7cd 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 { +@@ -499,7 +499,7 @@ public class CraftWorld implements World { @Override public boolean loadChunk(int x, int z, boolean generate) { org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot |