From 4bdc752acd08c999fb2e8be46519033213b0c690 Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@unaligned.org>
Date: Wed, 8 Jun 2011 20:08:29 -0400
Subject: [PATCH] Fixed issues introduced by recent 'portal changes' commit.

---
 src/main/java/net/minecraft/server/EntityBoat.java              | 1 +
 src/main/java/net/minecraft/server/EntityMinecart.java          | 1 +
 .../java/net/minecraft/server/ServerConfigurationManager.java   | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 178c9270b2..a7b7e48cf5 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -383,6 +383,7 @@ public class EntityBoat extends Entity {
             }
 
             if (this.passenger != null && this.passenger.dead) {
+                this.passenger.vehicle = null;
                 this.passenger = null;
             }
         }
diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java
index b38479af68..44d75344c6 100644
--- a/src/main/java/net/minecraft/server/EntityMinecart.java
+++ b/src/main/java/net/minecraft/server/EntityMinecart.java
@@ -583,6 +583,7 @@ public class EntityMinecart extends Entity implements IInventory {
             }
 
             if (this.passenger != null && this.passenger.dead) {
+                this.passenger.vehicle = null;
                 this.passenger = null;
             }
 
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index 72edfca410..425736f644 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -231,6 +231,8 @@ public class ServerConfigurationManager {
             cserver.getPluginManager().callEvent(respawnEvent);
             location = respawnEvent.getRespawnLocation();
             entityplayer.health = 20;
+            entityplayer.fireTicks = 0;
+            entityplayer.fallDistance = 0;
         } else {
             location.setWorld(this.server.a(i).getWorld());
         }