MC 1.14.1

This commit is contained in:
Zach Brown
2019-05-13 21:20:58 -05:00
parent d1310ddac5
commit 1ea2c3b4be
256 changed files with 762 additions and 787 deletions

View File

@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
new file mode 100644
index 0000000000..af9e4455c6
index 000000000..6bb2f98b4
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
@@ -0,0 +0,0 @@
@@ -62,7 +62,7 @@ index 0000000000..af9e4455c6
+
+ @Override
+ public void remove() {
+ worlds.set(last.dimension.getDimensionID()+1, null);
+ worlds.set(last.worldProvider.getDimensionManager().getDimensionID() + 1, null);
+ }
+ };
+ }
@@ -142,7 +142,7 @@ index 0000000000..af9e4455c6
+
+ @Override
+ public boolean containsValue(Object value) {
+ return value instanceof WorldServer && get(((WorldServer) value).dimension) != null;
+ return value instanceof WorldServer && get(((WorldServer) value).worldProvider.getDimensionManager()) != null;
+ }
+
+ @Nonnull
@@ -161,7 +161,7 @@ index 0000000000..af9e4455c6
+
+ @Override
+ public DimensionManager next() {
+ return iterator.next().dimension;
+ return iterator.next().worldProvider.getDimensionManager();
+ }
+
+ @Override
@@ -199,7 +199,7 @@ index 0000000000..af9e4455c6
+ @Override
+ public Entry<DimensionManager, WorldServer> next() {
+ WorldServer entry = iterator.next();
+ return new SimpleEntry<>(entry.dimension, entry);
+ return new SimpleEntry<>(entry.worldProvider.getDimensionManager(), entry);
+ }
+
+ @Override
@@ -217,7 +217,7 @@ index 0000000000..af9e4455c6
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 55c096bc08..04adcbb6b6 100644
index 0209330ad..0a02dece6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -239,7 +239,7 @@ index 55c096bc08..04adcbb6b6 100644
this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
}
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
// this.nextTick += 100L;
// this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
this.executeModerately();
// Iterator iterator = DimensionManager.a().iterator();
-