Upstream merge: Chicken jockey despawning and generation fixes

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-30 15:13:37 +01:00
parent d5a12c4949
commit 5f09e7b594
8 changed files with 22 additions and 22 deletions

View File

@@ -1,4 +1,4 @@
From 35608171284d5462cc9a5e0cceb58c311bdc6bbb Mon Sep 17 00:00:00 2001
From 7b8655419021c68c1b8801b3a7ed96216c38e776 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
@@ -18,10 +18,10 @@ index 1fc7a22..d091bcf 100644
Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6c77253..4c3fd8a 100644
index 403489e..dad8964 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1490,7 +1490,7 @@ public abstract class EntityLiving extends Entity {
@@ -1494,7 +1494,7 @@ public abstract class EntityLiving extends Entity {
protected void bn() {
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));