From 3218739c2fd38d7960fb4563e4cd447ccf55eaa4 Mon Sep 17 00:00:00 2001 From: Cryptite Date: Mon, 13 Dec 2021 08:32:54 -0600 Subject: [PATCH] Need to remove here otherwise this can fill up endlessly --- patches/server/0001-Build-Changes.patch | 6 +++--- ... 0019-Add-BlockDestroyedByNeighborEvent.patch} | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) rename patches/server/{0019-Add-player-data-saving-events.patch => 0019-Add-BlockDestroyedByNeighborEvent.patch} (86%) diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch index 24ab4fa75..498562cf2 100644 --- a/patches/server/0001-Build-Changes.patch +++ b/patches/server/0001-Build-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build Changes diff --git a/build.gradle.kts b/build.gradle.kts -index e067c69fea1dec79ef8e97cad1c74020b6a3a235..a4b442683945184c12ccc375a6d6b8d18b13ccd4 100644 +index f442236efe30d7d9e0c6a8dfb0f040540dc62753..bcdeb5a1c3c10d86d116dbf4257eb7b9d12f4426 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,8 +22,8 @@ repositories { @@ -19,7 +19,7 @@ index e067c69fea1dec79ef8e97cad1c74020b6a3a235..a4b442683945184c12ccc375a6d6b8d1 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -74,7 +74,7 @@ tasks.jar { +@@ -75,7 +75,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -28,7 +28,7 @@ index e067c69fea1dec79ef8e97cad1c74020b6a3a235..a4b442683945184c12ccc375a6d6b8d1 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -201,7 +201,7 @@ tasks.test { +@@ -202,7 +202,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { diff --git a/patches/server/0019-Add-player-data-saving-events.patch b/patches/server/0019-Add-BlockDestroyedByNeighborEvent.patch similarity index 86% rename from patches/server/0019-Add-player-data-saving-events.patch rename to patches/server/0019-Add-BlockDestroyedByNeighborEvent.patch index 2102bf830..ef57cfcb2 100644 --- a/patches/server/0019-Add-player-data-saving-events.patch +++ b/patches/server/0019-Add-BlockDestroyedByNeighborEvent.patch @@ -1,9 +1,22 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 7 Dec 2021 07:59:41 -0600 -Subject: [PATCH] Add player data saving events +Subject: [PATCH] Add BlockDestroyedByNeighborEvent +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +index b03eacbef3cf15b70ec012af0870975d3e8e8cba..d792f9ad494f01d6ca78704a9fadf445e0d4e65e 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +@@ -606,6 +606,8 @@ public class ServerPlayerGameMode { + enuminteractionresult1 = stack.placeItem(itemactioncontext, hand); + } + ++ world.pendingPlayerBlockEvents.remove(blockposition); // Paper ++ + if (enuminteractionresult1.consumesAction()) { + CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(player, blockposition, itemstack1); + } diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java index 9f3355dbbbab1ab88cf2b7034130c2888e38d7a7..ec43aa3661bc891a17670aec54d3f009c29b463b 100644 --- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java