Upstream Merge

This commit is contained in:
md_5 2013-10-24 21:23:24 +11:00
parent aa0536e414
commit f775c4dbd1
19 changed files with 90 additions and 88 deletions

View file

@ -1,14 +1,14 @@
From 671c8e6f49c82a03125fb9983a3d1df081f6ccd7 Mon Sep 17 00:00:00 2001
From e0fec2ec7e896f2c660729f24eb0b72791865915 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e8315dd..fc71833 100644
index 9f75d8e..856c713 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1267,4 +1267,14 @@ public class CraftWorld implements World {
@@ -1268,4 +1268,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.x, chunk.z);
}
}
@ -84,5 +84,5 @@ index ac73273..63ce45a 100644
+ // Spigot end
}
--
1.8.1.2
1.8.3.2