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

Upstream: Add more expansive UUID based operations

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-03-30 09:09:24 +11:00
parent 36fa69bb23
commit 968a96a1d3
10 changed files with 44 additions and 44 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 3424b3f7065054cdd942eb6ad56d86eab89e672a Mon Sep 17 00:00:00 2001
From dc945bb032e60d81ba93c5bd07b473fd282ec312 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 2f514b5..96a3eb8 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 7aedef4..50a27fb 100644
index 9c81339..aa76abe 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -310,8 +310,10 @@ public final class CraftServer implements Server {
@@ -309,8 +309,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@@ -70,7 +70,7 @@ index 7aedef4..50a27fb 100644
}
public boolean getCommandBlockOverride(String command) {
@@ -726,6 +728,7 @@ public final class CraftServer implements Server {
@@ -736,6 +738,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
@@ -78,7 +78,7 @@ index 7aedef4..50a27fb 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -740,11 +743,14 @@ public final class CraftServer implements Server {
@@ -750,11 +753,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
@@ -297,5 +297,5 @@ index 0000000..961ddb4
+ }
+}
--
1.8.5.2.msysgit.0
1.8.3.2