Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed player teleportation

Browse Source
This commit is contained in:
Dinnerbone 2011-02-05 20:25:28 +00:00
parent 2be5181b0c
commit bf304ddc43
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -5,6 +5,7 @@ import net.minecraft.server.WorldServer;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
public abstract class CraftEntity implements org.bukkit.entity.Entity { public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -105,6 +106,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
} }
public void teleportTo(Location location) { public void teleportTo(Location location) {
entity.world = ((CraftWorld)location.getWorld()).getHandle();
entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
} }

6
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -7,6 +7,7 @@ import net.minecraft.server.EntityPlayer;
import net.minecraft.server.Packet; import net.minecraft.server.Packet;
import net.minecraft.server.Packet3Chat; import net.minecraft.server.Packet3Chat;
import net.minecraft.server.Packet6SpawnPosition; import net.minecraft.server.Packet6SpawnPosition;
import net.minecraft.server.WorldServer;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -62,11 +63,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entity.a.b(new Packet3Chat(message)); entity.a.b(new Packet3Chat(message));
} }
@Override
public void teleportTo(Location location) {
entity.a.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
}
public String getDisplayName() { public String getDisplayName() {
return name; return name;
} }