Merge in changes.

This commit is contained in:
md_5 2015-01-16 14:58:23 +11:00 committed by Zach Brown
parent c6b30147f0
commit bfc8900321
9 changed files with 39 additions and 39 deletions

View file

@ -1,4 +1,4 @@
From 3d085f28590dfc86aec47a6412dbf6dabfcaafc8 Mon Sep 17 00:00:00 2001
From a9654381036acf78c53c250d77127e5e6523e212 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 b4ad7d1..4c33f5a 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 066c681..3f134f9 100644
index dac2ad0..5ef7d97 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1372,4 +1372,14 @@ public class CraftWorld implements World {
@@ -1345,4 +1345,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}