Merge pull request #30 from TehRainbowGuy/Boat-Dupe

Fixes boat dupe
This commit is contained in:
md-5 2013-04-05 14:10:39 -07:00
commit c7acdbe8ed

View file

@ -0,0 +1,25 @@
From dd262b67dd4a781a72db65f1be65e80c103fa042 Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Fri, 5 Apr 2013 18:13:35 +0100
Subject: [PATCH] Boat dupe fix.
---
src/main/java/net/minecraft/server/EntityBoat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 8839a45..953e86c 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -294,7 +294,7 @@ public class EntityBoat extends Entity {
this.move(this.motX, this.motY, this.motZ);
if (this.positionChanged && d3 > 0.2D) {
- if (!this.world.isStatic) {
+ if (!this.world.isStatic && !this.dead) { // Spigot - Boat dupe fix
// CraftBukkit start
Vehicle vehicle = (Vehicle) this.getBukkitEntity();
VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, null);
--
1.8.2