Upstream merge

This commit is contained in:
Thinkofdeath 2015-03-17 21:22:17 +00:00 committed by Zach Brown
parent a34dea5aed
commit 4c22e13cf9
6 changed files with 30 additions and 17 deletions

View file

@ -1,4 +1,4 @@
From af542d3375e7b4fa8fed4bca3c6a8460ed1f4257 Mon Sep 17 00:00:00 2001
From 75dfbcf387efcbb563549aaaa6838a6438f14571 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
@ -25,10 +25,10 @@ index 629e6b8..4b3fcac 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 621c89f..20357f9 100644
index 0d80c41..eb2f6db 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1353,4 +1353,14 @@ public class CraftWorld implements World {
@@ -1357,4 +1357,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}