Remove "Don't double add golems to world"

Fixed upstream
This commit is contained in:
Shane Freeder
2019-01-17 02:02:56 +00:00
parent bd8cab5d23
commit 0d458bd338
65 changed files with 198 additions and 219 deletions

View File

@@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
a permanent change in that it won't go back if you remove it from paper.yml
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index f3f2a0b69..6f76351b8 100644
index 6bd59a886d..359c538f32 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ import java.lang.reflect.Modifier;
@@ -59,7 +59,7 @@ index f3f2a0b69..6f76351b8 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7b24f6e24..11510640a 100644
index 6138c14eae..5393a11db0 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 implements IAsyncTaskHandler, IMojangStati
@@ -72,7 +72,7 @@ index 7b24f6e24..11510640a 100644
if (j == 0) {
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
index 4e971d244..65eed2a90 100644
index 8458dc17d4..b5fb95293e 100644
--- a/src/main/java/net/minecraft/server/WorldData.java
+++ b/src/main/java/net/minecraft/server/WorldData.java
@@ -0,0 +0,0 @@ public class WorldData {
@@ -85,7 +85,7 @@ index 4e971d244..65eed2a90 100644
String s = nbttagcompound.getString("generatorName");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 392cd0e3d..62903f374 100644
index 5372e9d540..18bc27ee66 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {