diff options
Diffstat (limited to 'src/main/java/net/minecraft')
3 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index 178c9270..a7b7e48c 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 b38479af..44d75344 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 72edfca4..425736f6 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()); } |