Merge in changes.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From ff00b8a9c49a289d0cac4c8fb4119e61c2fd140b Mon Sep 17 00:00:00 2001
|
||||
From 3037321cf7de8d37558eac71f49126224b543e5c 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
|
||||
@@ -25,10 +25,10 @@ index 7eb41e1..b65c225 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index fc8517d..b231ee2 100644
|
||||
index 1530f18..ece05ff 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1626,7 +1626,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1629,7 +1629,7 @@ public abstract class EntityLiving extends Entity {
|
||||
protected void bK() {
|
||||
List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user