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

39 lines
2.0 KiB
Diff
Raw Normal View History

It compiles
2019-05-06 19:30:27 +00:00
From bd56fb5c4a5eee6d61c68e569a6f758cb48bad78 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
It compiles
2019-05-06 19:30:27 +00:00
index 982dce4800..d18a530a4d 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
Fix some more compile errors
2019-05-06 03:53:47 +00:00
@@ -997,7 +997,14 @@ public final class CraftServer implements Server {
Update Upstream
2019-05-06 02:58:04 +00:00
}
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
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