SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-01-31 20:42:29 +00:00
parent 161ec4151b
commit 99ececedb4
23 changed files with 113 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View File

@@ -1,4 +1,4 @@
From e97da5da5fb74f5212a6075c94adf147c31824ab Mon Sep 17 00:00:00 2001
From 57b4275cba2ec0d77c900c51383f3e41375df5b9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@@ -54,10 +54,10 @@ index f850a0f..cd529ec 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 596bfcf..fc5d8a6 100644
index e4d7a05..d5c1ffb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -232,8 +232,10 @@ public final class CraftServer implements Server {
@@ -231,8 +231,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@@ -70,7 +70,7 @@ index 596bfcf..fc5d8a6 100644
}
private File getConfigFile() {
@@ -583,6 +585,7 @@ public final class CraftServer implements Server {
@@ -582,6 +584,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
@@ -78,7 +78,7 @@ index 596bfcf..fc5d8a6 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -597,11 +600,13 @@ public final class CraftServer implements Server {
@@ -596,11 +599,13 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
@@ -296,5 +296,5 @@ index 0000000..961ddb4
+ }
+}
--
1.8.3.2
1.8.4.msysgit.0