Update to CraftBukkit 1.4.7-R1

This commit is contained in:
md_5
2013-01-31 16:56:47 +11:00
parent b809164b5d
commit cd35b5e5b0
3 changed files with 11 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
From 47c9f07d091d4669fd669569ee924ba083c19b21 Mon Sep 17 00:00:00 2001
From 92f2c13f80e1503d4e5812a26f1fe34d77098272 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 29 Jan 2013 16:51:35 +1100
Subject: [PATCH] Spigot changes.
@@ -66,7 +66,7 @@ index a689360..b97a549 100644
+/dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f0b0bfb..bd394ae 100644
index d697ca1..b8d2ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,8 @@
@@ -585,7 +585,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 f669a00..dee6579 100644
index e9f6a6b..b15a1d1 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 {
@@ -597,7 +597,7 @@ index f669a00..dee6579 100644
} else {
String s2 = socketaddress.toString();
@@ -913,7 +913,13 @@ public abstract class PlayerList {
@@ -921,7 +921,13 @@ public abstract class PlayerList {
public void r() {
while (!this.players.isEmpty()) {
@@ -1596,7 +1596,7 @@ index 0000000..e30615f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f0e24d2..1c61830 100644
index b6c7b1c..992131c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -212,10 +212,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {