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

Upstream merge

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-05-14 14:02:09 +01:00
parent d54d6ad87d
commit 51faa817d1
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0005-Spigot-Configuration.patch
View File

@@ -1,4 +1,4 @@
From 65856207ce4a6941e16aee9636f85f6209b07f85 Mon Sep 17 00:00:00 2001
From 113ad2d77cebbed4a6dbbcb7cec0e476f494b17b 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 bbf61a3..fab5025 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 59010eb..bb1bddf 100644
index 853e5d2..95742fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -316,8 +316,10 @@ public final class CraftServer implements Server {
@@ -314,8 +314,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@@ -70,7 +70,7 @@ index 59010eb..bb1bddf 100644
}
public boolean getCommandBlockOverride(String command) {
@@ -751,6 +753,7 @@ public final class CraftServer implements Server {
@@ -749,6 +751,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@@ -78,7 +78,7 @@ index 59010eb..bb1bddf 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -765,11 +768,14 @@ public final class CraftServer implements Server {
@@ -763,11 +766,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}