diff --git a/Paper b/Paper index b74fe8ea1..bd1e1ad1a 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit b74fe8ea113f37f056f160717986c22c480c1e58 +Subproject commit bd1e1ad1aab0b79f62f05aaf6622cfb0dbb5976f diff --git a/current-paper b/current-paper index 3a88f0aa3..00f3207d0 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.1--f40e6bab8d6c1157e6edc0d15fcfd0f8e351fc3f +1.15.1--89ecbfdef624bc2dd537a4a3c2dcae349c60face 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 ebd464029..14275f75b 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 3f684028d9178608f302ef468f19e4fe89d8cb74 Mon Sep 17 00:00:00 2001 +From 086d06c91d3c358f3b7b0603530a5c668f488c76 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 @@ -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 725c9059d..8205b4767 100644 +index 579b779aa..d6fd253e5 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3046,6 +3046,36 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3064,6 +3064,36 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public List getRaids(); @@ -175,5 +175,5 @@ index 725c9059d..8205b4767 100644 * Represents various map environment types that a world may be */ -- -2.24.0.rc1 +2.24.0 diff --git a/patches/api/0020-Add-getPlacementBlockData-to-World.patch b/patches/api/0020-Add-getPlacementBlockData-to-World.patch index f55e11ce5..43fc6d7c2 100644 --- a/patches/api/0020-Add-getPlacementBlockData-to-World.patch +++ b/patches/api/0020-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From cf82e3c599dd3c048b0f452ec5209df163028b94 Mon Sep 17 00:00:00 2001 +From df13ad308de51c50e411f06f6a7380aff8bae8ec 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 8205b4767..887ac0645 100644 +index d6fd253e5..17a45a9b6 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3074,6 +3074,16 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -3092,6 +3092,16 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param enabled True to enable */ void setFluidTickEventEnabled(boolean enabled); @@ -29,5 +29,5 @@ index 8205b4767..887ac0645 100644 /** -- -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 748686760..702b9880b 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 464fb34e27bf195e29a5a33cca4d05e739862e6e Mon Sep 17 00:00:00 2001 +From 12219d4512c64cfd4c3f8cab42083202698c5b31 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 @@ -10,7 +10,7 @@ Subject: [PATCH] Add block and fluid tick events 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 84c069330..8ae7b7784 100644 +index 84c0693303..8ae7b7784c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -595,7 +595,7 @@ public class WorldServer extends World { @@ -48,7 +48,7 @@ index 84c069330..8ae7b7784 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f68744460..3ad3415c4 100644 +index f4d45baf27..10c659da7a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -62,6 +62,13 @@ public class PurpurWorldConfig { @@ -66,10 +66,10 @@ index f68744460..3ad3415c4 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 87395de25..be37281d5 100644 +index 4d7a7a8fe8..7945904713 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2392,6 +2392,24 @@ public class CraftWorld implements World { +@@ -2401,6 +2401,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 c2a735d37..808200dd3 100644 --- a/patches/server/0069-Add-getPlacementBlockData-to-World.patch +++ b/patches/server/0069-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From 4b57bf6cf59f6995211ea71b7993a6a2f8e492ef Mon Sep 17 00:00:00 2001 +From 1917eaeb325abd940cfda12932c514362043acaa 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 be37281d5..128a18f71 100644 +index 7945904713..4f4d9f0c0b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2408,6 +2408,11 @@ public class CraftWorld implements World { +@@ -2417,6 +2417,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 1b467fadc..d5dd52fff 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 b047f60737999b2a998432710fda57e575456288 Mon Sep 17 00:00:00 2001 +From 9ca51998cd10d839a9df510e1c383e415b5ce20f 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 @@ -9,7 +9,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c5cd19afa..d918a1c7f 100644 +index c5cd19afa0..d918a1c7fe 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1406,8 +1406,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -25,10 +25,10 @@ index c5cd19afa..d918a1c7f 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 128a18f71..b1d980623 100644 +index 4f4d9f0c0b..fe44a37305 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -381,12 +381,16 @@ public class CraftWorld implements World { +@@ -380,12 +380,16 @@ public class CraftWorld implements World { @Override public boolean setSpawnLocation(int x, int y, int z) { try {