diff --git a/Paper b/Paper index 6aa27ec37..f09fed894 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 6aa27ec37863db0f1103fd7d258d3d25c7a96bef +Subproject commit f09fed894f877d2d97dedb2a77f5262c17455063 diff --git a/current-paper b/current-paper index a3c46d6cc..d4a220b1a 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--aa896671b94e3d1baf86d3376f564b08bd09fc48 +1.15.2--b1a9373b711c4c77b9feab2527f766c5bce67268 diff --git a/patches/api/0018-Add-block-and-fluid-tick-events.patch b/patches/api/0018-Add-block-and-fluid-tick-events.patch index 9ad21fa16..7102ec8b4 100644 --- a/patches/api/0018-Add-block-and-fluid-tick-events.patch +++ b/patches/api/0018-Add-block-and-fluid-tick-events.patch @@ -1,4 +1,4 @@ -From a826a72e5296e80f2858925861cbe089f149fe29 Mon Sep 17 00:00:00 2001 +From 5c6ebf213cb5ff0c16fb1c8f2e7721b666873ae7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 23:58:29 -0500 Subject: [PATCH] Add block and fluid tick events @@ -13,7 +13,7 @@ Subject: [PATCH] Add block and fluid tick events diff --git a/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java new file mode 100644 -index 000000000..02787304f +index 00000000..02787304 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java @@ -0,0 +1,55 @@ @@ -74,7 +74,7 @@ index 000000000..02787304f +} diff --git a/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java new file mode 100644 -index 000000000..1a8f0b674 +index 00000000..1a8f0b67 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java @@ -0,0 +1,55 @@ @@ -134,10 +134,10 @@ index 000000000..1a8f0b674 + } +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 6fe025338..1edf1ec72 100644 +index 5047be15..c12d0efc 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3058,6 +3058,36 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3117,6 +3117,36 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public List getRaids(); diff --git a/patches/api/0020-Add-getPlacementBlockData-to-World.patch b/patches/api/0020-Add-getPlacementBlockData-to-World.patch index 429bd7b45..e1c864439 100644 --- a/patches/api/0020-Add-getPlacementBlockData-to-World.patch +++ b/patches/api/0020-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From 211fe2b9508d8cbdd4b1d9a38e0b7c98e7d37745 Mon Sep 17 00:00:00 2001 +From 0961dfd2209679bbd2bf0f76de5a6c77bfca7eb1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:34:36 -0500 Subject: [PATCH] Add getPlacementBlockData to World @@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World 1 file changed, 10 insertions(+) diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 1edf1ec72..5a28b8bed 100644 +index c12d0efc..07e0f604 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3086,6 +3086,16 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param enabled True to enable */ void setFluidTickEventEnabled(boolean enabled); diff --git a/patches/api/0030-Add-moon-phase-API.patch b/patches/api/0030-Add-moon-phase-API.patch index 9c1f5148e..2b49a4e9d 100644 --- a/patches/api/0030-Add-moon-phase-API.patch +++ b/patches/api/0030-Add-moon-phase-API.patch @@ -1,4 +1,4 @@ -From afac0359f02085127ab36121d871e8685a39de85 Mon Sep 17 00:00:00 2001 +From 08f61132cb4349e6e64d37f4bd67fb233ede48f7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 1 Feb 2020 22:22:07 -0600 Subject: [PATCH] Add moon phase API @@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java new file mode 100644 -index 000000000..f5ad98c62 +index 00000000..f5ad98c6 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/MoonPhase.java @@ -0,0 +1,36 @@ @@ -52,10 +52,10 @@ index 000000000..f5ad98c62 + } +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 5a28b8bed..887598ff7 100644 +index 07e0f604..7566d701 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3096,6 +3096,14 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3155,6 +3155,14 @@ public interface World extends PluginMessageRecipient, Metadatable { */ @NotNull BlockData getPlacementBlockData(@NotNull BlockData blockData, @NotNull Location location); diff --git a/patches/server/0020-Allow-color-codes-on-signs.patch b/patches/server/0020-Allow-color-codes-on-signs.patch index 2fadc6036..c4f90ab41 100644 --- a/patches/server/0020-Allow-color-codes-on-signs.patch +++ b/patches/server/0020-Allow-color-codes-on-signs.patch @@ -1,4 +1,4 @@ -From 370e0d0af302dfdcc30802a93f7b24d8a7a10bab Mon Sep 17 00:00:00 2001 +From 47688a093b08a48bbfa21412812646fcd333f4dd Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Allow color codes on signs @@ -11,7 +11,7 @@ Subject: [PATCH] Allow color codes on signs 4 files changed, 28 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 15230a834c..5e56e0e3e8 100644 +index 15230a834..5e56e0e3e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1124,6 +1124,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -23,10 +23,10 @@ index 15230a834c..5e56e0e3e8 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a1ce2d2e07..213f7992dc 100644 +index 108377d76..f7ee28913 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2575,6 +2575,14 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2576,6 +2576,14 @@ public class PlayerConnection implements PacketListenerPlayIn { } } // Paper end @@ -42,7 +42,7 @@ index a1ce2d2e07..213f7992dc 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 5eb86c4341..8810a1120b 100644 +index 5eb86c434..8810a1120 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -119,6 +119,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -67,7 +67,7 @@ index 5eb86c4341..8810a1120b 100644 @Override public PacketPlayOutTileEntityData getUpdatePacket() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6cb887ca8b..061b02e45a 100644 +index 6cb887ca8..061b02e45 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -95,4 +95,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0063-Alternative-Keepalive-Handling.patch b/patches/server/0063-Alternative-Keepalive-Handling.patch index 57fb45085..f61c4030d 100644 --- a/patches/server/0063-Alternative-Keepalive-Handling.patch +++ b/patches/server/0063-Alternative-Keepalive-Handling.patch @@ -1,4 +1,4 @@ -From cbad8f66944097c606fb7e9351e5261a6cb05bbe Mon Sep 17 00:00:00 2001 +From 9d111c00f2bbadee62ebce15c894ce547fffe2a8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 11 Oct 2019 00:17:39 -0500 Subject: [PATCH] Alternative Keepalive Handling @@ -10,7 +10,7 @@ Subject: [PATCH] Alternative Keepalive Handling 3 files changed, 34 insertions(+) diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java -index 8e93f1540b..470f92c4fb 100644 +index 8e93f1540..470f92c4f 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java +++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java @@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet { @@ -22,7 +22,7 @@ index 8e93f1540b..470f92c4fb 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2e74e46d5d..b51f7b4537 100644 +index d99a2837c..36b4fb28c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -55,7 +55,7 @@ index 2e74e46d5d..b51f7b4537 100644 if (this.isPendingPing()) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info -@@ -2666,6 +2682,18 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2667,6 +2683,18 @@ public class PlayerConnection implements PacketListenerPlayIn { @Override public void a(PacketPlayInKeepAlive packetplayinkeepalive) { @@ -75,7 +75,7 @@ index 2e74e46d5d..b51f7b4537 100644 if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 25ca8381b3..306d86d842 100644 +index 40b5db9e0..e7805ad1c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -167,6 +167,11 @@ public class PurpurConfig { @@ -91,5 +91,5 @@ index 25ca8381b3..306d86d842 100644 private static void updatePermissionsOnWorldChange() { updatePermissionsOnWorldChange = getBoolean("settings.update-perms-on-world-change", updatePermissionsOnWorldChange); -- -2.24.0.rc1 +2.24.0 diff --git a/patches/server/0067-Add-block-and-fluid-tick-events.patch b/patches/server/0067-Add-block-and-fluid-tick-events.patch index 849477a5e..354de2ea1 100644 --- a/patches/server/0067-Add-block-and-fluid-tick-events.patch +++ b/patches/server/0067-Add-block-and-fluid-tick-events.patch @@ -1,4 +1,4 @@ -From 9b58483c21b9f618f82e789cac99aa43b25a6626 Mon Sep 17 00:00:00 2001 +From b621663e391fccba27606d962ace87003b605d37 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 23:58:56 -0500 Subject: [PATCH] Add block and fluid tick events @@ -66,10 +66,10 @@ index b2c62de05..b82fc8d19 100644 private void editableSigns() { editableSigns = getBoolean("editable-signs", editableSigns); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7b89ccbe7..5c892a694 100644 +index a14b8cb98..9a8c5b7f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2393,6 +2393,24 @@ public class CraftWorld implements World { +@@ -2412,6 +2412,24 @@ public class CraftWorld implements World { return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList()); } diff --git a/patches/server/0069-Add-getPlacementBlockData-to-World.patch b/patches/server/0069-Add-getPlacementBlockData-to-World.patch index 44982dce8..6a8f67ec8 100644 --- a/patches/server/0069-Add-getPlacementBlockData-to-World.patch +++ b/patches/server/0069-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From 2995e429743f1cd97ae7eb189cfe8ebdd4149fcc Mon Sep 17 00:00:00 2001 +From 80c9dfe529da583048f1462eb442a48f0f9950ef Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:34:43 -0500 Subject: [PATCH] Add getPlacementBlockData to World @@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5c892a694..9960504d0 100644 +index 9a8c5b7f7..776ccdd8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2409,6 +2409,11 @@ public class CraftWorld implements World { +@@ -2428,6 +2428,11 @@ public class CraftWorld implements World { public void setFluidTickEventEnabled(boolean enabled) { getHandle().purpurConfig.fluidTickEvent = enabled; } diff --git a/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index d44de5699..0c8f1dba4 100644 --- a/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -1,4 +1,4 @@ -From a2abd93861a3b9c6bfa57fe1e595198cb72de361 Mon Sep 17 00:00:00 2001 +From 8c9fb370d55528137d85489af0726b7e28816f97 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 01:42:50 -0500 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases @@ -25,10 +25,10 @@ index b737a0f0c..716a3885a 100644 public boolean a(EntityHuman entityhuman, BlockPosition blockposition) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9960504d0..760d32107 100644 +index 776ccdd8e..65d7aa8ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -377,12 +377,16 @@ public class CraftWorld implements World { +@@ -375,12 +375,16 @@ public class CraftWorld implements World { @Override public boolean setSpawnLocation(int x, int y, int z) { try { diff --git a/patches/server/0101-Add-moon-phase-API.patch b/patches/server/0101-Add-moon-phase-API.patch index 12d3c56d7..fcfecd758 100644 --- a/patches/server/0101-Add-moon-phase-API.patch +++ b/patches/server/0101-Add-moon-phase-API.patch @@ -1,4 +1,4 @@ -From eb8428292559cbaa3e2131d35ec07e94cd702648 Mon Sep 17 00:00:00 2001 +From 5b8ee0e14a894dbd16b92e46f44761f6211bc1c6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 1 Feb 2020 22:22:16 -0600 Subject: [PATCH] Add moon phase API @@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 760d32107..1e1b9cb32 100644 +index 65d7aa8ec..47d1f7c39 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2418,6 +2418,11 @@ public class CraftWorld implements World { +@@ -2437,6 +2437,11 @@ public class CraftWorld implements World { IBlockData validData = net.minecraft.server.Block.getValidBlockForPosition(((CraftBlockData) blockdata).getState(), getHandle(), net.minecraft.server.MCUtil.toBlockPosition(location)); return CraftBlockData.fromData(validData == null ? Blocks.AIR.getBlockData() : validData); }