SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge: Chicken jockey despawning and generation fixes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch
View File

@@ -1,4 +1,4 @@
From 42e14e927828be9932f627f80ad68977387cba90 Mon Sep 17 00:00:00 2001
From d5d17c04b5a9c0f672c267ab36b7dc15eb1dcd2d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -0500
Subject: [PATCH] Cap Entity Collisions
@@ -19,10 +19,10 @@ index c4bdccf..c542460 100644
if (entity.passenger != this && entity.vehicle != this) {
double d0 = entity.locX - this.locX;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4c3fd8a..f531103 100644
index dad8964..234d7db 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1491,7 +1491,9 @@ public abstract class EntityLiving extends Entity {
@@ -1495,7 +1495,9 @@ public abstract class EntityLiving extends Entity {
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
if (this.R() && list != null && !list.isEmpty()) { // Spigot: Add this.R() condition
@@ -32,7 +32,7 @@ index 4c3fd8a..f531103 100644
Entity entity = (Entity) list.get(i);
// TODO better check now?
@@ -1502,9 +1504,12 @@ public abstract class EntityLiving extends Entity {
@@ -1506,9 +1508,12 @@ public abstract class EntityLiving extends Entity {
// CraftBukkit end
if (entity.R()) {