Skip to content

Commit

Permalink
Fix missing debug trace
Browse files Browse the repository at this point in the history
  • Loading branch information
electronicboy committed May 27, 2024
1 parent 347bbe3 commit 23fe116
Show file tree
Hide file tree
Showing 23 changed files with 59 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ index 386f8b825dac6dda253b0c55a3a0eeef5bdca271..0087e8037e2d30d940e6efa886226e59
// CraftBukkit end
if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.shutdown(); // Paper - Plugin remapping
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8e0e38bc85ca97f4c632299affc366ece7e63a52..01224af0835a00343923767186dceb53900c0832 100644
index c6a96664ef914d0da1e24b93da93bad1b4a17716..45799f96978a68a79b4c89e17e9b543dec99a8b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1024,6 +1024,31 @@ public final class CraftServer implements Server {
@@ -1024,6 +1024,32 @@ public final class CraftServer implements Server {
org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
}

Expand All @@ -50,6 +50,7 @@ index 8e0e38bc85ca97f4c632299affc366ece7e63a52..01224af0835a00343923767186dceb53
+ plugin.getPluginMeta().getDisplayName(),
+ "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
+ ));
+ if (console.isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread(worker.getThread(), "still running"); // Paper - Debugging
+ }
+ }
+ // Paper end - Wait for Async Tasks during shutdown
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0434-Add-getOfflinePlayerIfCached-String.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)


diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d996a0d5d14448e49a8b6730425dd5b50abc1e72..f809efa0e9640f3ccd6233d8ed7864a23bbd0bba 100644
index 38da9a19546c979c4bfd4ab23a34b77266911a24..756fb2613c2cca9ff937a770b1e35c499fcb97a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1928,6 +1928,28 @@ public final class CraftServer implements Server {
@@ -1929,6 +1929,28 @@ public final class CraftServer implements Server {
return result;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ index 7c1304b42c6692cf66613fb2cf851b9df17f21e5..0b19ddf411933240f3cdc6b4e9ce3817
@Override
public B get(NamespacedKey namespacedKey) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f809efa0e9640f3ccd6233d8ed7864a23bbd0bba..1f4efb4ee9454b3115607f4e1f05d0b03f20c882 100644
index 756fb2613c2cca9ff937a770b1e35c499fcb97a1..c18515e56a8ac010897e3e2f65b2b28566f4ef71 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -279,7 +279,7 @@ public final class CraftServer implements Server {
Expand All @@ -801,7 +801,7 @@ index f809efa0e9640f3ccd6233d8ed7864a23bbd0bba..1f4efb4ee9454b3115607f4e1f05d0b0
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
@@ -2689,7 +2689,7 @@ public final class CraftServer implements Server {
@@ -2690,7 +2690,7 @@ public final class CraftServer implements Server {

@Override
public <T extends Keyed> Registry<T> getRegistry(Class<T> aClass) {
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0512-Expand-world-key-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ index 9801f78f1d44fd5a72fbdb319681b683e8fb85c4..1e720b96f0367652db6924b8654deaa9
// Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1f4efb4ee9454b3115607f4e1f05d0b03f20c882..1f6218e580a2a0138d128940a709147c20354b39 100644
index c18515e56a8ac010897e3e2f65b2b28566f4ef71..db230f2d1254ef34233324b638a33445df1a9ee1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1145,9 +1145,15 @@ public final class CraftServer implements Server {
@@ -1146,9 +1146,15 @@ public final class CraftServer implements Server {
File folder = new File(this.getWorldContainer(), name);
World world = this.getWorld(name);

Expand All @@ -41,7 +41,7 @@ index 1f4efb4ee9454b3115607f4e1f05d0b03f20c882..1f6218e580a2a0138d128940a709147c

if (folder.exists()) {
Preconditions.checkArgument(folder.isDirectory(), "File (%s) exists and isn't a folder", name);
@@ -1273,7 +1279,7 @@ public final class CraftServer implements Server {
@@ -1274,7 +1280,7 @@ public final class CraftServer implements Server {
} else if (name.equals(levelName + "_the_end")) {
worldKey = net.minecraft.world.level.Level.END;
} else {
Expand All @@ -50,7 +50,7 @@ index 1f4efb4ee9454b3115607f4e1f05d0b03f20c882..1f6218e580a2a0138d128940a709147c
}

// If set to not keep spawn in memory (changed from default) then adjust rule accordingly
@@ -1369,6 +1375,15 @@ public final class CraftServer implements Server {
@@ -1370,6 +1376,15 @@ public final class CraftServer implements Server {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0541-Add-basic-Datapack-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6fbb452b583d5b5ab95a057a7e6ed17d2e6a2b15..2098ea8dcdf8e3a704db972192993cbc616d7dac 100644
index db230f2d1254ef34233324b638a33445df1a9ee1..ec9f392d92d96a6b4f3a513361282085a95769b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -301,6 +301,7 @@ public final class CraftServer implements Server {
Expand All @@ -111,7 +111,7 @@ index 6fbb452b583d5b5ab95a057a7e6ed17d2e6a2b15..2098ea8dcdf8e3a704db972192993cbc
}

public boolean getCommandBlockOverride(String command) {
@@ -2968,5 +2970,11 @@ public final class CraftServer implements Server {
@@ -2969,5 +2971,11 @@ public final class CraftServer implements Server {
public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
return mobGoals;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,10 @@ index 58ea6a1f95a09c22125a8262b1b221004ebce0e4..ea6533c1ac218aa075da3401807a06fc
BlockPos blockposition = NaturalSpawner.getRandomPosWithin(world, chunk);

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ceb18ee56a99f56997f09e9d6dd01b8b58194430..2e7c206956ded65795f5f2d36acce97381cf80ea 100644
index bb157f5a9d0dca8d108411a6ce09cc0297026334..ff6efc68070218e9ae23f1ec358955ff84f75439 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2293,6 +2293,11 @@ public final class CraftServer implements Server {
@@ -2294,6 +2294,11 @@ public final class CraftServer implements Server {

@Override
public int getSpawnLimit(SpawnCategory spawnCategory) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen


diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2e7c206956ded65795f5f2d36acce97381cf80ea..1eb46f3ef17f61d887d972e71a982b2ec216ef05 100644
index ff6efc68070218e9ae23f1ec358955ff84f75439..95d6d4483fbfc0c0aa18b551f84694aa02f59a20 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2478,6 +2478,90 @@ public final class CraftServer implements Server {
@@ -2479,6 +2479,90 @@ public final class CraftServer implements Server {
return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ index 2986dc458ddbd642669c6c2c104df2a2446e5b11..533e1225b863ef314b7defebc4787304
biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1eb46f3ef17f61d887d972e71a982b2ec216ef05..32338b8fa891262801ed45c7b64b306591e060fc 100644
index 95d6d4483fbfc0c0aa18b551f84694aa02f59a20..f9b4f47553e7180c315052a2af3340043d140be1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1270,7 +1270,7 @@ public final class CraftServer implements Server {
@@ -1271,7 +1271,7 @@ public final class CraftServer implements Server {
List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
LevelStem worlddimension = iregistry.get(actualDimension);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 32338b8fa891262801ed45c7b64b306591e060fc..0796d35e5fb3fb3fac3f4f8b33624638727a55e1 100644
index f9b4f47553e7180c315052a2af3340043d140be1..29471efb47878244352195f012cac3ed3ed15122 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2124,6 +2124,13 @@ public final class CraftServer implements Server {
@@ -2125,6 +2125,13 @@ public final class CraftServer implements Server {
return this.console.console;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
Copies appropriate checks from CraftWorld#getSpawnLimit

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0796d35e5fb3fb3fac3f4f8b33624638727a55e1..7a812e65fb6a8ea9345a8e67b4a2dd033637d580 100644
index 29471efb47878244352195f012cac3ed3ed15122..a7de5a300ab2c6f2feecc92d34785763e53282cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2301,6 +2301,8 @@ public final class CraftServer implements Server {
@@ -2302,6 +2302,8 @@ public final class CraftServer implements Server {
@Override
public int getSpawnLimit(SpawnCategory spawnCategory) {
// Paper start - Add mobcaps commands
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0679-Add-GameEvent-tags.patch
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7a812e65fb6a8ea9345a8e67b4a2dd033637d580..3adf411927a168ca1fdf68bc60f894548e2fc1e7 100644
index a7de5a300ab2c6f2feecc92d34785763e53282cc..826124355e809f9865e00fd2743d8a7e48ddb074 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2729,6 +2729,15 @@ public final class CraftServer implements Server {
@@ -2730,6 +2730,15 @@ public final class CraftServer implements Server {
return (org.bukkit.Tag<T>) new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey);
}
}
Expand All @@ -65,7 +65,7 @@ index 7a812e65fb6a8ea9345a8e67b4a2dd033637d580..3adf411927a168ca1fdf68bc60f89454
default -> throw new IllegalArgumentException();
}

@@ -2761,6 +2770,13 @@ public final class CraftServer implements Server {
@@ -2762,6 +2771,13 @@ public final class CraftServer implements Server {
net.minecraft.core.Registry<EntityType<?>> entityTags = BuiltInRegistries.ENTITY_TYPE;
return entityTags.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ index b72b5fb2fa1d372f914ad1084e43b21b14f4fffb..f9a4b5558bacff9c478f407c2656cb08

if (worlddata.getCustomBossEvents() != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3adf411927a168ca1fdf68bc60f894548e2fc1e7..9790cff70cf006c35dbfe95653a1bacdea33607d 100644
index 826124355e809f9865e00fd2743d8a7e48ddb074..5bfa93a55e486a9d26fc174db87f0f6705522363 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1296,10 +1296,11 @@ public final class CraftServer implements Server {
@@ -1297,10 +1297,11 @@ public final class CraftServer implements Server {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0687-Custom-Potion-Mixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ index 3ebfd564d4bbf00da5919e966f3d047285845640..887957ce1ddc2f32569405642f35df46
}

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 151340a41adbdf9effe78aed8122abfaf54d9b7a..2f550747f605e27b9fe968c94ae37aa265624462 100644
index 5bfa93a55e486a9d26fc174db87f0f6705522363..9ef7950eefea0693e51622cd55258fa1a884e961 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -304,6 +304,7 @@ public final class CraftServer implements Server {
Expand All @@ -301,7 +301,7 @@ index 151340a41adbdf9effe78aed8122abfaf54d9b7a..2f550747f605e27b9fe968c94ae37aa2
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
}

@@ -3092,5 +3094,9 @@ public final class CraftServer implements Server {
@@ -3093,5 +3095,9 @@ public final class CraftServer implements Server {
return datapackManager;
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0698-Fix-saving-in-unloadWorld.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Fix saving in unloadWorld
Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0ed2d510918cc14ce3d7e5def2021e07f7ad378f..3d7427e17211cf80dd512e3b312f2e95d9c33bf6 100644
index 9ef7950eefea0693e51622cd55258fa1a884e961..ba56431ca9c8a29b8e2470858135d185e96dac62 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1345,7 +1345,7 @@ public final class CraftServer implements Server {
@@ -1346,7 +1346,7 @@ public final class CraftServer implements Server {

try {
if (save) {
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0710-WorldCreator-keepSpawnLoaded.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded


diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3d7427e17211cf80dd512e3b312f2e95d9c33bf6..41865320f9eeb94dbbdefb863c0f14e0b3c006f3 100644
index ba56431ca9c8a29b8e2470858135d185e96dac62..519dc5dedeac097f4cfc8104b00a22de369aa07f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1288,7 +1288,7 @@ public final class CraftServer implements Server {
@@ -1289,7 +1289,7 @@ public final class CraftServer implements Server {
}

// If set to not keep spawn in memory (changed from default) then adjust rule accordingly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ index 6f72020fab6e4e175a265f85ec9efc31811bdbfd..803c234ec23147ed317ae46394381414
this.profiler.popPush("connection");
MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 41865320f9eeb94dbbdefb863c0f14e0b3c006f3..2dfa5c1d0ee75056383e52be0f55cf924f0828f0 100644
index 519dc5dedeac097f4cfc8104b00a22de369aa07f..f2b75588265739c9b0876d8953184be43139e104 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -882,6 +882,11 @@ public final class CraftServer implements Server {
Expand All @@ -60,15 +60,15 @@ index 41865320f9eeb94dbbdefb863c0f14e0b3c006f3..2dfa5c1d0ee75056383e52be0f55cf92
public DedicatedPlayerList getHandle() {
return this.playerList;
}
@@ -1142,6 +1147,7 @@ public final class CraftServer implements Server {
@@ -1143,6 +1148,7 @@ public final class CraftServer implements Server {
@Override
public World createWorld(WorldCreator creator) {
Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
+ //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");

String name = creator.name();
@@ -1318,6 +1324,7 @@ public final class CraftServer implements Server {
@@ -1319,6 +1325,7 @@ public final class CraftServer implements Server {

@Override
public boolean unloadWorld(World world, boolean save) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ index 8c2dcc4134d96351cee75773214f3f47e71533e9..e6bfcc50cdf728216084bc00a5bb8b6b
Date date = new Date();

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2dfa5c1d0ee75056383e52be0f55cf924f0828f0..865d330d4c707c4b649650730a66a43e3cb01936 100644
index f2b75588265739c9b0876d8953184be43139e104..291e444e75d4155a0bcb2335a54436a4ddf69f7c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1887,7 +1887,7 @@ public final class CraftServer implements Server {
@@ -1888,7 +1888,7 @@ public final class CraftServer implements Server {
// Paper end
Set<CommandSender> recipients = new HashSet<>();
for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
Expand Down
10 changes: 5 additions & 5 deletions patches/server/0868-API-for-updating-recipes-on-clients.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ index 0246db4a1f6eb168fa88260282311fee2ebb6014..ea04eb049e16d1027d15f9863d1fcd16
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 dc2201ff1a1a95c30b050e58703d78098c8daea8..fab25844aca60c9da96ab160a3aa445800789e7d 100644
index 24bded5c7c2c64b359348929ee94cbef8899a121..8d8142d80a552f43c89a94ea4180ef9320b346f6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1138,6 +1138,18 @@ public final class CraftServer implements Server {
@@ -1139,6 +1139,18 @@ public final class CraftServer implements Server {
ReloadCommand.reload(this.console);
}

Expand All @@ -61,7 +61,7 @@ index dc2201ff1a1a95c30b050e58703d78098c8daea8..fab25844aca60c9da96ab160a3aa4458
private void loadIcon() {
this.icon = new CraftIconCache(null);
try {
@@ -1517,6 +1529,13 @@ public final class CraftServer implements Server {
@@ -1518,6 +1530,13 @@ public final class CraftServer implements Server {

@Override
public boolean addRecipe(Recipe recipe) {
Expand All @@ -75,7 +75,7 @@ index dc2201ff1a1a95c30b050e58703d78098c8daea8..fab25844aca60c9da96ab160a3aa4458
CraftRecipe toAdd;
if (recipe instanceof CraftRecipe) {
toAdd = (CraftRecipe) recipe;
@@ -1546,6 +1565,11 @@ public final class CraftServer implements Server {
@@ -1547,6 +1566,11 @@ public final class CraftServer implements Server {
}
}
toAdd.addToCraftingManager();
Expand All @@ -87,7 +87,7 @@ index dc2201ff1a1a95c30b050e58703d78098c8daea8..fab25844aca60c9da96ab160a3aa4458
return true;
}

@@ -1726,10 +1750,23 @@ public final class CraftServer implements Server {
@@ -1727,10 +1751,23 @@ public final class CraftServer implements Server {

@Override
public boolean removeRecipe(NamespacedKey recipeKey) {
Expand Down
Loading

0 comments on commit 23fe116

Please sign in to comment.