core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0388-don-t-NPE-on-dimension...

39 lines
2.1 KiB
Diff
Raw Normal View History

More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
From 73fa66d60a2fe81ffd58f1446678ebddb1786fae Mon Sep 17 00:00:00 2001
don't NPE on dimensionmanager toString CraftBukkit uses vanillas DimensionManager, but does not actually register its own dimension types, etc, due to vanilla This causes issues because anything, e.g. command feedback, trying to print information about the world will often attempt to print out the dimension name, which ends up throwing an NPE due to the lack of a registered type, we work around this by just returning the world name, this is not super elegant, but is the only route that promises not to break stuff.
2019-04-22 19:20:22 +00:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 22 Apr 2019 19:51:14 +0100
Subject: [PATCH] don't NPE on dimensionmanager toString
CraftBukkit uses vanillas DimensionManager, but does not actually
register its own dimension types, etc, due to vanilla
This causes issues because anything, e.g. command feedback, trying
to print information about the world will often attempt to print out
the dimension name, which ends up throwing an NPE due to the lack of
a registered type, we work around this by just returning the world name,
this is not super elegant, but is the only route that promises not to
break stuff.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
index b05d7b0e87..7cc0c7c162 100644
don't NPE on dimensionmanager toString CraftBukkit uses vanillas DimensionManager, but does not actually register its own dimension types, etc, due to vanilla This causes issues because anything, e.g. command feedback, trying to print information about the world will often attempt to print out the dimension name, which ends up throwing an NPE due to the lack of a registered type, we work around this by just returning the world name, this is not super elegant, but is the only route that promises not to break stuff.
2019-04-22 19:20:22 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
@@ -993,7 +993,14 @@ public final class CraftServer implements Server {
don't NPE on dimensionmanager toString CraftBukkit uses vanillas DimensionManager, but does not actually register its own dimension types, etc, due to vanilla This causes issues because anything, e.g. command feedback, trying to print information about the world will often attempt to print out the dimension name, which ends up throwing an NPE due to the lack of a registered type, we work around this by just returning the world name, this is not super elegant, but is the only route that promises not to break stuff.
2019-04-22 19:20:22 +00:00
worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
DimensionManager actualDimension = DimensionManager.a(creator.environment().getId());
- DimensionManager internalDimension = new DimensionManager(dimension, name, name, (w, manager) -> actualDimension.getWorldProvider(w), actualDimension.hasSkyLight());
don't NPE on dimensionmanager toString CraftBukkit uses vanillas DimensionManager, but does not actually register its own dimension types, etc, due to vanilla This causes issues because anything, e.g. command feedback, trying to print information about the world will often attempt to print out the dimension name, which ends up throwing an NPE due to the lack of a registered type, we work around this by just returning the world name, this is not super elegant, but is the only route that promises not to break stuff.
2019-04-22 19:20:22 +00:00
+ // Paper start - override toString
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
+ DimensionManager internalDimension = new DimensionManager(dimension, name, name, (w, manager) -> actualDimension.getWorldProvider(w), actualDimension.hasSkyLight()) {
don't NPE on dimensionmanager toString CraftBukkit uses vanillas DimensionManager, but does not actually register its own dimension types, etc, due to vanilla This causes issues because anything, e.g. command feedback, trying to print information about the world will often attempt to print out the dimension name, which ends up throwing an NPE due to the lack of a registered type, we work around this by just returning the world name, this is not super elegant, but is the only route that promises not to break stuff.
2019-04-22 19:20:22 +00:00
+ @Override
+ public String toString() {
+ return name;
+ }
+ };
+ // Paper end
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
WorldServer internal = (WorldServer) new WorldServer(console, console.executorService, sdm, worlddata, internalDimension, console.getMethodProfiler(), getServer().worldLoadListenerFactory.create(11), creator.environment(), generator);
don't NPE on dimensionmanager toString CraftBukkit uses vanillas DimensionManager, but does not actually register its own dimension types, etc, due to vanilla This causes issues because anything, e.g. command feedback, trying to print information about the world will often attempt to print out the dimension name, which ends up throwing an NPE due to the lack of a registered type, we work around this by just returning the world name, this is not super elegant, but is the only route that promises not to break stuff.
2019-04-22 19:20:22 +00:00
if (!(worlds.containsKey(name.toLowerCase(java.util.Locale.ENGLISH)))) {
--
2.21.0