twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-13 03:05:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Portal changes.

Browse Source
This commit is contained in:
Tahg
2011-06-08 13:40:40 -04:00
committed by EvilSeph
parent 8b49a945c2
commit 5296f97cde
6 changed files with 80 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minecraft/server/Entity.java
View File

@@ -14,6 +14,7 @@ import org.bukkit.entity.Vehicle;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
import org.bukkit.event.vehicle.VehicleExitEvent;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDamageByBlockEvent;
@@ -750,7 +751,13 @@ public abstract class Entity {
}
public void a(World world) {
this.world = world;
// CraftBukkit start
if(world == null) {
this.die();
this.world = ((CraftWorld)Bukkit.getServer().getWorlds().get(0)).getHandle();
}
else this.world = world;
// CraftBukkit end
}
public void setLocation(double d0, double d1, double d2, float f, float f1) {
@@ -909,6 +916,8 @@ public abstract class Entity {
}
public void e(NBTTagCompound nbttagcompound) {
// CraftBukkit - reset world
a(((CraftWorld)Bukkit.getServer().getWorld(nbttagcompound.getString("World"))).getHandle());
NBTTagList nbttaglist = nbttagcompound.l("Pos");
NBTTagList nbttaglist1 = nbttagcompound.l("Motion");
NBTTagList nbttaglist2 = nbttagcompound.l("Rotation");