diff options
| author | Byteflux <[email protected]> | 2015-07-14 08:59:57 -0700 |
|---|---|---|
| committer | Byteflux <[email protected]> | 2015-07-14 08:59:57 -0700 |
| commit | c17e209dc1dd4c41ced1685157f19df93d87437b (patch) | |
| tree | d49c4a9b02899331bbf7d7f69a69fc8acee9b50c /Spigot-Server-Patches/0002-PaperSpigot-config-files.patch | |
| parent | 301396a116b1d0218d8beb657dc532b9b8b341c8 (diff) | |
| download | Paper-c17e209dc1dd4c41ced1685157f19df93d87437b.tar.gz Paper-c17e209dc1dd4c41ced1685157f19df93d87437b.zip | |
Rebuild patches
Diffstat (limited to 'Spigot-Server-Patches/0002-PaperSpigot-config-files.patch')
| -rw-r--r-- | Spigot-Server-Patches/0002-PaperSpigot-config-files.patch | 12 |
1 files 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 81b7eeb176..ce00cab629 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,11 +1,11 @@ -From 185afbb2201ab2cc12ae0f8d15f8cdc173695fe2 Mon Sep 17 00:00:00 2001 +From a898a29d702635a9a745cde1c263de3f0dadbc1d Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Thu, 28 May 2015 00:08:15 -0500 Subject: [PATCH] PaperSpigot config files diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 8303441..bc03bb3 100644 +index 7a8ce4a..9975f18 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -177,6 +177,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -20,7 +20,7 @@ index 8303441..bc03bb3 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 ad0ee74..350bd0d 100644 +index 0271b19..822ddeb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -161,6 +161,8 @@ public abstract class World implements IBlockAccess { @@ -41,10 +41,10 @@ index ad0ee74..350bd0d 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 fd41124..cc0626f 100644 +index df34ddc..8b4fc89 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -689,6 +689,7 @@ public final class CraftServer implements Server { +@@ -687,6 +687,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -52,7 +52,7 @@ index fd41124..cc0626f 100644 for (WorldServer world : console.worlds) { world.worldData.setDifficulty(difficulty); world.setSpawnFlags(monsters, animals); -@@ -704,12 +705,14 @@ public final class CraftServer implements Server { +@@ -702,12 +703,14 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot |