geforkt von Mirrors/Paper
71c84c8132
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
115 Zeilen
4.5 KiB
Diff
115 Zeilen
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 21 Aug 2021 17:25:38 -0700
|
|
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 fade1e36037075aae968eb90bbfeac76bfed496a..bc0e9fb41fe22e0a603837fcbdd82134f51d21d9 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -1531,6 +1531,13 @@ public abstract class PlayerList {
|
|
}
|
|
|
|
public void reloadResources() {
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ this.reloadAdvancementData();
|
|
+ this.reloadTagData();
|
|
+ this.reloadRecipeData();
|
|
+ }
|
|
+ public void reloadAdvancementData() {
|
|
+ // Paper end - API for updating recipes on clients
|
|
// CraftBukkit start
|
|
/*Iterator iterator = this.advancements.values().iterator();
|
|
|
|
@@ -1546,7 +1553,15 @@ public abstract class PlayerList {
|
|
}
|
|
// CraftBukkit end
|
|
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ }
|
|
+ public void reloadTagData() {
|
|
+ // Paper end - API for updating recipes on clients
|
|
this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries)));
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ }
|
|
+ public void reloadRecipeData() {
|
|
+ // Paper end - API for updating recipes on clients
|
|
ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getRecipes());
|
|
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 b5140b37d2161d89c6c5d6465949e96f5472057a..458bf151cb733e023b897a2acff2ab3a10fe0949 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1141,6 +1141,18 @@ public final class CraftServer implements Server {
|
|
ReloadCommand.reload(this.console);
|
|
}
|
|
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ @Override
|
|
+ public void updateResources() {
|
|
+ this.playerList.reloadResources();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void updateRecipes() {
|
|
+ this.playerList.reloadRecipeData();
|
|
+ }
|
|
+ // Paper end - API for updating recipes on clients
|
|
+
|
|
private void loadIcon() {
|
|
this.icon = new CraftIconCache(null);
|
|
try {
|
|
@@ -1516,6 +1528,13 @@ public final class CraftServer implements Server {
|
|
|
|
@Override
|
|
public boolean addRecipe(Recipe recipe) {
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ return this.addRecipe(recipe, false);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean addRecipe(Recipe recipe, boolean resendRecipes) {
|
|
+ // Paper end - API for updating recipes on clients
|
|
CraftRecipe toAdd;
|
|
if (recipe instanceof CraftRecipe) {
|
|
toAdd = (CraftRecipe) recipe;
|
|
@@ -1545,6 +1564,11 @@ public final class CraftServer implements Server {
|
|
}
|
|
}
|
|
toAdd.addToCraftingManager();
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ if (resendRecipes) {
|
|
+ this.playerList.reloadRecipeData();
|
|
+ }
|
|
+ // Paper end - API for updating recipes on clients
|
|
return true;
|
|
}
|
|
|
|
@@ -1725,10 +1749,23 @@ public final class CraftServer implements Server {
|
|
|
|
@Override
|
|
public boolean removeRecipe(NamespacedKey recipeKey) {
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ return this.removeRecipe(recipeKey, false);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean removeRecipe(NamespacedKey recipeKey, boolean resendRecipes) {
|
|
+ // Paper end - API for updating recipes on clients
|
|
Preconditions.checkArgument(recipeKey != null, "recipeKey == null");
|
|
|
|
ResourceLocation mcKey = CraftNamespacedKey.toMinecraft(recipeKey);
|
|
- return this.getServer().getRecipeManager().removeRecipe(mcKey);
|
|
+ // Paper start - resend recipes on successful removal
|
|
+ boolean removed = this.getServer().getRecipeManager().removeRecipe(mcKey);
|
|
+ if (removed && resendRecipes) {
|
|
+ this.playerList.reloadRecipeData();
|
|
+ }
|
|
+ return removed;
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|