Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 03:55:14 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issues introduced by recent 'portal changes' commit.

Browse Source
This commit is contained in:
EvilSeph 2011-06-08 20:08:29 -04:00
parent 8320917363
commit 4bdc752acd
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minecraft/server/EntityBoat.java
View File

@ -383,6 +383,7 @@ public class EntityBoat extends Entity {
} }
if (this.passenger != null && this.passenger.dead) { if (this.passenger != null && this.passenger.dead) {
this.passenger.vehicle = null;
this.passenger = null; this.passenger = null;
} }
} }

1
src/main/java/net/minecraft/server/EntityMinecart.java
View File

@ -583,6 +583,7 @@ public class EntityMinecart extends Entity implements IInventory {
} }
if (this.passenger != null && this.passenger.dead) { if (this.passenger != null && this.passenger.dead) {
this.passenger.vehicle = null;
this.passenger = null; this.passenger = null;
} }

2
src/main/java/net/minecraft/server/ServerConfigurationManager.java
View File

@ -231,6 +231,8 @@ public class ServerConfigurationManager {
cserver.getPluginManager().callEvent(respawnEvent); cserver.getPluginManager().callEvent(respawnEvent);
location = respawnEvent.getRespawnLocation(); location = respawnEvent.getRespawnLocation();
entityplayer.health = 20; entityplayer.health = 20;
entityplayer.fireTicks = 0;
entityplayer.fallDistance = 0;
} else { } else {
location.setWorld(this.server.a(i).getWorld()); location.setWorld(this.server.a(i).getWorld());
} }