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

Update patch fluff + only record sync times.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-01-25 14:00:07 +11:00
parent 98f33b082b
commit 37daa41841
4 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CraftBukkit-Patches/0001-Spigot-changes.patch
View File

@@ -1,4 +1,4 @@
From 87a3ec2b6f68e6f87645abcc32426e4c0141e666 Mon Sep 17 00:00:00 2001
From 773d5d2e6c47548c120cb5c33619964136a384e5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 22 Jan 2013 15:56:54 +1100
Subject: [PATCH] Spigot changes.
@@ -163,7 +163,7 @@ index 79a007c..0bc7882 100644
int j1 = j + random.nextInt(5) - 3;
int k1 = k + random.nextInt(3) - 1;
diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java
index bfc48d4..8fa8302 100644
index 38fac4c..4ff3111 100644
--- a/src/main/java/net/minecraft/server/BlockMushroom.java
+++ b/src/main/java/net/minecraft/server/BlockMushroom.java
@@ -23,7 +23,7 @@ public class BlockMushroom extends BlockFlower {
@@ -586,7 +586,7 @@ index fac9ea5..43a24f5 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 2fb83cf..ced8cf0 100644
index f669a00..dee6579 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -253,7 +253,7 @@ public abstract class PlayerList {
@@ -598,7 +598,7 @@ index 2fb83cf..ced8cf0 100644
} else {
String s2 = socketaddress.toString();
@@ -901,7 +901,13 @@ public abstract class PlayerList {
@@ -913,7 +913,13 @@ public abstract class PlayerList {
public void r() {
while (!this.players.isEmpty()) {
@@ -1277,7 +1277,7 @@ index 3f73ef9..a42aa1e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 936cbc6..b8e9085 100644
index e7c0760..a7785b7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -146,7 +146,7 @@ public final class CraftServer implements Server {
@@ -1348,7 +1348,7 @@ index 936cbc6..b8e9085 100644
boolean animals = config.getBoolean("spawn-animals", console.getSpawnAnimals());
boolean monsters = config.getBoolean("spawn-monsters", console.worlds.get(0).difficulty > 0);
int difficulty = config.getInt("difficulty", console.worlds.get(0).difficulty);
@@ -588,6 +610,7 @@ public final class CraftServer implements Server {
@@ -591,6 +613,7 @@ public final class CraftServer implements Server {
"This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin"
));
}
@@ -1356,7 +1356,7 @@ index 936cbc6..b8e9085 100644
loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP);
enablePlugins(PluginLoadOrder.POSTWORLD);
@@ -1036,11 +1059,8 @@ public final class CraftServer implements Server {
@@ -1039,11 +1062,8 @@ public final class CraftServer implements Server {
return count;
}
@@ -1369,7 +1369,7 @@ index 936cbc6..b8e9085 100644
OfflinePlayer result = getPlayerExact(name);
String lname = name.toLowerCase();
@@ -1048,17 +1068,7 @@ public final class CraftServer implements Server {
@@ -1051,17 +1071,7 @@ public final class CraftServer implements Server {
result = offlinePlayers.get(lname);
if (result == null) {
@@ -1388,7 +1388,7 @@ index 936cbc6..b8e9085 100644
result = new CraftOfflinePlayer(this, name);
offlinePlayers.put(lname, result);
}
@@ -1196,7 +1206,7 @@ public final class CraftServer implements Server {
@@ -1199,7 +1209,7 @@ public final class CraftServer implements Server {
Set<OfflinePlayer> players = new HashSet<OfflinePlayer>();
for (String file : files) {
@@ -1397,7 +1397,7 @@ index 936cbc6..b8e9085 100644
}
players.addAll(Arrays.asList(getOnlinePlayers()));
@@ -1302,7 +1312,7 @@ public final class CraftServer implements Server {
@@ -1305,7 +1315,7 @@ public final class CraftServer implements Server {
public List<String> tabCompleteCommand(Player player, String message) {
List<String> completions = null;
try {
@@ -1406,7 +1406,7 @@ index 936cbc6..b8e9085 100644
} catch (CommandException ex) {
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
@@ -1338,4 +1348,52 @@ public final class CraftServer implements Server {
@@ -1341,4 +1351,52 @@ public final class CraftServer implements Server {
public CraftItemFactory getItemFactory() {
return CraftItemFactory.instance();
}
@@ -1460,10 +1460,10 @@ index 936cbc6..b8e9085 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index cb20066..3544aa3 100644
index 6e364b1..45217cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -73,7 +73,81 @@ public class CraftWorld implements World {
@@ -75,7 +75,81 @@ public class CraftWorld implements World {
if (server.chunkGCPeriod > 0) {
chunkGCTickCount = rand.nextInt(server.chunkGCPeriod);
}