OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 12:41:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed various multiworld teleporting issues

Browse source
This commit is contained in:
Dinnerbone 2011-02-06 02:04:15 +00:00
parent 4c9f1a2275
commit 590b3874a8
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ public class ServerConfigurationManager {
public static Logger a = Logger.getLogger("Minecraft");
public List b = new ArrayList();
private MinecraftServer c;
public MinecraftServer c; // Craftbukkit - public
public PlayerManager d; // Craftbukkit - public
private int e;
private Set f = new HashSet();

23
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file

@ -8,6 +8,8 @@ import net.minecraft.server.ItemInWorldManager;
import net.minecraft.server.Packet;
import net.minecraft.server.Packet3Chat;
import net.minecraft.server.Packet6SpawnPosition;
import net.minecraft.server.Packet9Respawn;
import net.minecraft.server.ServerConfigurationManager;
import net.minecraft.server.WorldServer;
import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
@ -115,18 +117,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void teleportTo(Location location) {
boolean worldChange = location.getWorld() != getWorld();
ServerConfigurationManager manager = server.getHandle();
if (worldChange) {
// Unload player from current chunks
server.getServer().f.d.b(entity);
manager.c.k.a(entity);
manager.c.k.b(entity);
manager.d.b(entity);
entity.world.e(entity);
entity.world = ((CraftWorld)location.getWorld()).getHandle();
entity.c = new ItemInWorldManager(((CraftWorld)location.getWorld()).getHandle());
entity.c.a = entity;
((WorldServer)entity.world).A.d((int) entity.locX >> 4, (int) entity.locZ >> 4);
}
entity.world = ((CraftWorld)location.getWorld()).getHandle();
entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
entity.a.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
if (worldChange) {
// Forceload the chunks around player
server.getServer().f.d.a(entity);
manager.d.a(entity);
entity.world.a(entity);
}
}
}