Update from upstream SpigotMC

3e3ea0bd0d8
320ed92779f
612de468951
This commit is contained in:
Zach Brown 2014-12-14 15:54:10 -06:00
parent b532dbb6ce
commit 8bbab87c6b
92 changed files with 330 additions and 194 deletions

View file

@ -1,4 +1,4 @@
From dc7886d3fde174339f15c44078985ec3b795054f Mon Sep 17 00:00:00 2001
From 49a8359446f3929a0b2ac0de40c59502ddad5a58 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 83efd6a..8d28b9a 100644
index a7d3e5f..1353c90 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1323,4 +1323,14 @@ public class CraftWorld implements World {
@@ -1309,4 +1309,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}