Upstream merge: Chicken jockey despawning and generation fixes

This commit is contained in:
Thinkofdeath 2014-04-30 15:13:37 +01:00
parent 06bfcd26fb
commit 5d4ed8047a
8 changed files with 22 additions and 22 deletions

View file

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