Log correct recipes and advancement count on server start (#9978)
This commit is contained in:
@@ -18,6 +18,27 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
this.nodes.remove(advancement.holder().id());
|
this.nodes.remove(advancement.holder().id());
|
||||||
if (advancement.parent() == null) {
|
if (advancement.parent() == null) {
|
||||||
this.roots.remove(advancement);
|
this.roots.remove(advancement);
|
||||||
|
@@ -0,0 +0,0 @@ public class AdvancementTree {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- // AdvancementTree.LOGGER.info("Loaded {} advancements", this.nodes.size()); // CraftBukkit - moved to AdvancementDataWorld#reload
|
||||||
|
+ // AdvancementTree.LOGGER.info("Loaded {} advancements", this.nodes.size()); // CraftBukkit - moved to AdvancementDataWorld#reload // Paper - you say it was moved... but it wasn't :) it should be moved however, since this is called when the API creates an advancement
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean tryInsert(AdvancementHolder advancement) {
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/ServerAdvancementManager.java b/src/main/java/net/minecraft/server/ServerAdvancementManager.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/ServerAdvancementManager.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/ServerAdvancementManager.java
|
||||||
|
@@ -0,0 +0,0 @@ public class ServerAdvancementManager extends SimpleJsonResourceReloadListener {
|
||||||
|
AdvancementTree advancementtree = new AdvancementTree();
|
||||||
|
|
||||||
|
advancementtree.addAll(this.advancements.values());
|
||||||
|
+ LOGGER.info("Loaded {} advancements", advancementtree.nodes().size()); // Paper - moved from AdvancementTree#addAll
|
||||||
|
Iterator iterator = advancementtree.roots().iterator();
|
||||||
|
|
||||||
|
while (iterator.hasNext()) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -48,6 +69,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
if (ResourceLocation.isValidNamespace(string)) {
|
if (ResourceLocation.isValidNamespace(string)) {
|
||||||
set.add(string);
|
set.add(string);
|
||||||
} else {
|
} else {
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
|
||||||
|
@@ -0,0 +0,0 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
|
||||||
|
return entry1.getValue(); // CraftBukkit // Paper - decompile fix - *shrugs internally* // todo: is this needed anymore?
|
||||||
|
}));
|
||||||
|
this.byName = Maps.newHashMap(builder.build()); // CraftBukkit
|
||||||
|
- RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
|
||||||
|
+ RecipeManager.LOGGER.info("Loaded {} recipes", this.byName.size()); // Paper - log correct number of recipes
|
||||||
|
}
|
||||||
|
|
||||||
|
// CraftBukkit start
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
||||||
|
|||||||
Reference in New Issue
Block a user