Cleanup old async commands patch (#8895)

This commit is contained in:
SoSeDiK 2023-09-17 01:54:33 +03:00 committed by GitHub
parent 06a741d713
commit 064fb50cc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 273 additions and 365 deletions

View file

@ -39,10 +39,10 @@ index fff7ad7a45f310783ac96b44575ad3db13d537fa..640e9bd618dc8286933318744c2064ed
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 d62cdda5ef3691a54ce34729920bad8e16c7a883..54f27d91f941235a99e341ed84531ad7f0840728 100644
index 86b31f29742d940c43a3bca2d4b1910af2cbe1a8..7286623de9f104554d608bf1d192b8a8d890cb15 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1149,6 +1149,18 @@ public final class CraftServer implements Server {
@@ -1127,6 +1127,18 @@ public final class CraftServer implements Server {
ReloadCommand.reload(console);
}
@ -61,7 +61,7 @@ index d62cdda5ef3691a54ce34729920bad8e16c7a883..54f27d91f941235a99e341ed84531ad7
private void loadIcon() {
this.icon = new CraftIconCache(null);
try {
@@ -1491,6 +1503,13 @@ public final class CraftServer implements Server {
@@ -1469,6 +1481,13 @@ public final class CraftServer implements Server {
@Override
public boolean addRecipe(Recipe recipe) {
@ -75,7 +75,7 @@ index d62cdda5ef3691a54ce34729920bad8e16c7a883..54f27d91f941235a99e341ed84531ad7
CraftRecipe toAdd;
if (recipe instanceof CraftRecipe) {
toAdd = (CraftRecipe) recipe;
@@ -1520,6 +1539,11 @@ public final class CraftServer implements Server {
@@ -1498,6 +1517,11 @@ public final class CraftServer implements Server {
}
}
toAdd.addToCraftingManager();
@ -87,7 +87,7 @@ index d62cdda5ef3691a54ce34729920bad8e16c7a883..54f27d91f941235a99e341ed84531ad7
return true;
}
@@ -1639,10 +1663,23 @@ public final class CraftServer implements Server {
@@ -1617,10 +1641,23 @@ public final class CraftServer implements Server {
@Override
public boolean removeRecipe(NamespacedKey recipeKey) {