diff options
| author | Byteflux <[email protected]> | 2014-09-21 22:05:59 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2014-11-28 14:19:08 -0600 |
| commit | 1a6b7c9d79cb9117e39626008a43a4dec410f2e8 (patch) | |
| tree | 1fb020c8245b869b10d367946cfc753ca189fa60 /Spigot-Server-Patches/0002-PaperSpigot-config-files.patch | |
| parent | 39893976b414b096bfaa792541f23c01eefd2904 (diff) | |
| download | Paper-1a6b7c9d79cb9117e39626008a43a4dec410f2e8.tar.gz Paper-1a6b7c9d79cb9117e39626008a43a4dec410f2e8.zip | |
Update with latest patches from upstream SpigotMC
Diffstat (limited to 'Spigot-Server-Patches/0002-PaperSpigot-config-files.patch')
| -rw-r--r-- | Spigot-Server-Patches/0002-PaperSpigot-config-files.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index 09f70f919c..3be4e2faa8 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,4 +1,4 @@ -From 4580551f3e716c0f35e3667c6a1634c0994b3cf3 Mon Sep 17 00:00:00 2001 +From da7e53caceb34fb4e99f9363c281696e8e668625 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Sat, 12 Jul 2014 19:32:01 -0500 Subject: [PATCH] PaperSpigot config files @@ -20,7 +20,7 @@ index 9cc0526..e9a1a67 100644 i.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 6100297..744d942 100644 +index 7a547da..a6ef3b6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -197,6 +197,7 @@ public abstract class World implements IBlockAccess { @@ -40,10 +40,10 @@ index 6100297..744d942 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 2c3a140..93f2726 100644 +index 10621b3..1548042 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -813,6 +813,7 @@ public final class CraftServer implements Server { +@@ -814,6 +814,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init(); // Spigot @@ -51,7 +51,7 @@ index 2c3a140..93f2726 100644 for (WorldServer world : console.worlds) { world.difficulty = difficulty; world.setSpawnFlags(monsters, animals); -@@ -828,12 +829,14 @@ public final class CraftServer implements Server { +@@ -829,12 +830,14 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot |