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

Update to latest upstream

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-05-04 09:24:15 +10:00
parent d8b3cd4a33
commit 326c461585
25 changed files with 74 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CraftBukkit-Patches/0003-Spigot-Changes.patch
View File

@@ -1,4 +1,4 @@
From 4515bd7b5db7b0a91eef7fb323cfea8dbec70349 Mon Sep 17 00:00:00 2001
From f6bda668b73c66e0cfeef52dedd4d211b8f64176 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:17:36 +1000
Subject: [PATCH] Spigot Changes
@@ -259,10 +259,10 @@ index 0225f53..a8f1799 100644
// ++this.age; // CraftBukkit - Moved up
if (!this.world.isStatic && this.age >= 6000) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 55873f5..0f6a0ae 100644
index 5d10382..bc55a77 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -840,8 +840,20 @@ public class PlayerConnection extends Connection {
@@ -839,8 +839,20 @@ public class PlayerConnection extends Connection {
this.chat(s, packet3chat.a_());
@@ -284,7 +284,7 @@ index 55873f5..0f6a0ae 100644
if (packet3chat.a_()) {
Waitable waitable = new Waitable() {
@Override
@@ -962,7 +974,7 @@ public class PlayerConnection extends Connection {
@@ -961,7 +973,7 @@ public class PlayerConnection extends Connection {
}
try {
@@ -293,7 +293,7 @@ index 55873f5..0f6a0ae 100644
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
return;
}
@@ -1345,8 +1357,9 @@ public class PlayerConnection extends Connection {
@@ -1340,8 +1352,9 @@ public class PlayerConnection extends Connection {
flag = false;
} else {
for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {
@@ -305,10 +305,10 @@ index 55873f5..0f6a0ae 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 9e574be..900b6b8 100644
index b7e327b..169fa90 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -305,7 +305,7 @@ public abstract class PlayerList {
@@ -307,7 +307,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1);
} else if (!this.isWhitelisted(s)) {
@@ -317,7 +317,7 @@ index 9e574be..900b6b8 100644
} else {
String s2 = socketaddress.toString();
@@ -1046,7 +1046,13 @@ public abstract class PlayerList {
@@ -1048,7 +1048,13 @@ public abstract class PlayerList {
public void r() {
while (!this.players.isEmpty()) {
@@ -333,7 +333,7 @@ index 9e574be..900b6b8 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a7de90e..9181e37 100644
index 3a4ddea..70dd295 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -66,14 +66,27 @@ public abstract class World implements IBlockAccess {
@@ -601,7 +601,7 @@ index 49360c1..8114910 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8a079d3..e5ceed1 100644
index 6cb50b7..12c5f81 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -145,7 +145,7 @@ public final class CraftServer implements Server {
@@ -674,7 +674,7 @@ index 8a079d3..e5ceed1 100644
loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP);
enablePlugins(PluginLoadOrder.POSTWORLD);
@@ -1055,13 +1072,8 @@ public final class CraftServer implements Server {
@@ -1058,13 +1075,8 @@ public final class CraftServer implements Server {
return count;
}
@@ -689,7 +689,7 @@ index 8a079d3..e5ceed1 100644
OfflinePlayer result = getPlayerExact(name);
String lname = name.toLowerCase();
@@ -1069,17 +1081,7 @@ public final class CraftServer implements Server {
@@ -1072,17 +1084,7 @@ public final class CraftServer implements Server {
result = offlinePlayers.get(lname);
if (result == null) {
@@ -708,7 +708,7 @@ index 8a079d3..e5ceed1 100644
result = new CraftOfflinePlayer(this, name);
offlinePlayers.put(lname, result);
}
@@ -1217,7 +1219,7 @@ public final class CraftServer implements Server {
@@ -1220,7 +1222,7 @@ public final class CraftServer implements Server {
Set<OfflinePlayer> players = new HashSet<OfflinePlayer>();
for (String file : files) {
@@ -717,7 +717,7 @@ index 8a079d3..e5ceed1 100644
}
players.addAll(Arrays.asList(getOnlinePlayers()));
@@ -1323,7 +1325,7 @@ public final class CraftServer implements Server {
@@ -1326,7 +1328,7 @@ public final class CraftServer implements Server {
public List<String> tabCompleteCommand(Player player, String message) {
List<String> completions = null;
try {