aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1048-Incremental-chunk-and-player-saving.patch
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-10-31 12:44:02 +0100
committerGitHub <[email protected]>2024-10-31 12:44:02 +0100
commitdfedf79a2fecd80cafabcd82bb2e6dd80e558fc3 (patch)
tree5986a5b10f31ce04b6625b9e53f7e776faabbb09 /patches/server/1048-Incremental-chunk-and-player-saving.patch
parent40a960db45f45f381328a60695e933615475aea8 (diff)
downloadPaper-dfedf79a2fecd80cafabcd82bb2e6dd80e558fc3.tar.gz
Paper-dfedf79a2fecd80cafabcd82bb2e6dd80e558fc3.zip
Correctly cancel consumption of consumable
See: #11534
Diffstat (limited to 'patches/server/1048-Incremental-chunk-and-player-saving.patch')
-rw-r--r--patches/server/1048-Incremental-chunk-and-player-saving.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/1048-Incremental-chunk-and-player-saving.patch b/patches/server/1048-Incremental-chunk-and-player-saving.patch
index 239e73fd15..9494da1fd0 100644
--- a/patches/server/1048-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1048-Incremental-chunk-and-player-saving.patch
@@ -97,7 +97,7 @@ index 8ceeebb561046933cba0725e15732fa074226884..8c9148426f23cbbdfaf7ae66657d1a62
private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
private static final int FLY_STAT_RECORDING_SPEED = 25;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9c474f3e603c6c274610e15f184468dc640b5eb0..0856313f8da044bf021bf04f5ef67a17f4a9f7c6 100644
+index 88f40e54fa3b78d82261e06f941ef42587d52c25..cf42042c754b30e41c0ec8a6a15195369bdbd199 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -518,6 +518,7 @@ public abstract class PlayerList {
@@ -108,7 +108,7 @@ index 9c474f3e603c6c274610e15f184468dc640b5eb0..0856313f8da044bf021bf04f5ef67a17
this.playerIo.save(player);
ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
-@@ -1147,9 +1148,21 @@ public abstract class PlayerList {
+@@ -1152,9 +1153,21 @@ public abstract class PlayerList {
}
public void saveAll() {