Upstream merge

This commit is contained in:
md_5 2014-04-24 16:27:12 +10:00
parent 7cae4cb66f
commit 74c275f71c
78 changed files with 483 additions and 218 deletions

View file

@ -1,14 +1,14 @@
From d27a502bbf00ddc7a8a4ddd243de26f3499acd13 Mon Sep 17 00:00:00 2001
From 8a4ee6ed2b429e8fd918e873729b38b208c19422 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 4590a71..a97e330 100644
index 8ef5509..c7c6a6f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1284,4 +1284,14 @@ public class CraftWorld implements World {
@@ -1310,4 +1310,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}