mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-05 18:27:17 +01:00
Remove patch for upstream merge
This commit is contained in:
parent
5942d62aa5
commit
fbf4580cd2
5 changed files with 0 additions and 25 deletions
|
@ -1,25 +0,0 @@
|
||||||
From fc928096a3a6cf59ed11cd84f1368e1640c53125 Mon Sep 17 00:00:00 2001
|
|
||||||
From: me4502 <mnmiller1@hotmail.com>
|
|
||||||
Date: Fri, 22 Mar 2013 19:13:32 +1000
|
|
||||||
Subject: [PATCH] Fixed Bukkit-3831
|
|
||||||
|
|
||||||
---
|
|
||||||
src/main/java/net/minecraft/server/Entity.java | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
||||||
index c4c2595..35fd279 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
||||||
@@ -1449,7 +1449,7 @@ public abstract class Entity {
|
|
||||||
this.vehicle = null;
|
|
||||||
} else {
|
|
||||||
// CraftBukkit start
|
|
||||||
- if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle)) {
|
|
||||||
+ if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle) && entity.world.isChunkLoaded((int)entity.locX >> 4, (int)entity.locZ >> 4)) {
|
|
||||||
VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), this.bukkitEntity);
|
|
||||||
pluginManager.callEvent(event);
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.1-rc2
|
|
||||||
|
|
Loading…
Reference in a new issue