mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ci skip] Move chunk system patch back

Browse source
This commit is contained in:
Nassim Jahnke 2024-01-24 22:13:08 +01:00
parent b700460999
commit 1831240d1c
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
244 changed files with 994 additions and 1228 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/server/0906-API-for-updating-recipes-on-clients.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index bb5a51dec100fe7924fd00da9804a3040752a23f..9c392ac769ec8660cb70012744a64a522a5d23d4 100644
index 56d8767a19b03b5e70c6a5a5cd747a59abf062ee..fd32811f00a2c82dcb6efb9d78ffee0240d5de0b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1543,6 +1543,13 @@ public abstract class PlayerList {
@@ -1530,6 +1530,13 @@ public abstract class PlayerList {
}
public void reloadResources() {
@ -22,7 +22,7 @@ index bb5a51dec100fe7924fd00da9804a3040752a23f..9c392ac769ec8660cb70012744a64a52
// CraftBukkit start
/*Iterator iterator = this.advancements.values().iterator();
@@ -1558,7 +1565,15 @@ public abstract class PlayerList {
@@ -1545,7 +1552,15 @@ public abstract class PlayerList {
}
// CraftBukkit end
@ -39,7 +39,7 @@ index bb5a51dec100fe7924fd00da9804a3040752a23f..9c392ac769ec8660cb70012744a64a52
Iterator iterator1 = this.players.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fb542c304bb0ea3be61d92d3ee230c519b1994c7..5b7aed2c7ce8e1a1515ca0baf3596ffe2b506265 100644
index cc8e826c72ca954030c5b42f6704a6e95cb88c31..5ca1878e7c64ff1c270a3b90c456662cc2361f26 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1129,6 +1129,18 @@ public final class CraftServer implements Server {
@ -61,7 +61,7 @@ index fb542c304bb0ea3be61d92d3ee230c519b1994c7..5b7aed2c7ce8e1a1515ca0baf3596ffe
private void loadIcon() {
this.icon = new CraftIconCache(null);
try {
@@ -1503,6 +1515,13 @@ public final class CraftServer implements Server {
@@ -1504,6 +1516,13 @@ public final class CraftServer implements Server {
@Override
public boolean addRecipe(Recipe recipe) {
@ -75,7 +75,7 @@ index fb542c304bb0ea3be61d92d3ee230c519b1994c7..5b7aed2c7ce8e1a1515ca0baf3596ffe
CraftRecipe toAdd;
if (recipe instanceof CraftRecipe) {
toAdd = (CraftRecipe) recipe;
@@ -1532,6 +1551,11 @@ public final class CraftServer implements Server {
@@ -1533,6 +1552,11 @@ public final class CraftServer implements Server {
}
}
toAdd.addToCraftingManager();
@ -87,7 +87,7 @@ index fb542c304bb0ea3be61d92d3ee230c519b1994c7..5b7aed2c7ce8e1a1515ca0baf3596ffe
return true;
}
@@ -1712,10 +1736,23 @@ public final class CraftServer implements Server {
@@ -1713,10 +1737,23 @@ public final class CraftServer implements Server {
@Override
public boolean removeRecipe(NamespacedKey recipeKey) {