From 965e98f6e2942099ae46135252f5b60c4536d384 Mon Sep 17 00:00:00 2001 From: Zach Date: Fri, 30 Jan 2015 23:59:30 -0600 Subject: [PATCH] Rebuild patches --- .../0002-PaperSpigot-config-files.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index 06a1ae8..f455af6 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,4 +1,4 @@ -From 1783d691ec4beeedf0ff8431bc4ad381f82e490d Mon Sep 17 00:00:00 2001 +From 43c2e536c0f107384894b535ab02e25fef71d9a8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Jul 2014 19:32:01 -0500 Subject: [PATCH] PaperSpigot config files @@ -20,7 +20,7 @@ index 2806f1e..2e38fec 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9bcbba6..9cf1463 100644 +index c50aa62..ac11b9a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -192,6 +192,8 @@ public abstract class World implements IBlockAccess { @@ -41,10 +41,10 @@ index 9bcbba6..9cf1463 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 980dd99..7d7bba4 100644 +index d7e3919..d67d3d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -691,6 +691,7 @@ public final class CraftServer implements Server { +@@ -693,6 +693,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init(); // Spigot @@ -52,7 +52,7 @@ index 980dd99..7d7bba4 100644 for (WorldServer world : console.worlds) { world.worldData.setDifficulty(difficulty); world.setSpawnFlags(monsters, animals); -@@ -706,12 +707,14 @@ public final class CraftServer implements Server { +@@ -708,12 +709,14 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot @@ -297,5 +297,5 @@ index 0000000..f3bc3aa + } +} -- -1.9.1 +2.2.2