Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 20:40:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

Fixed various multiworld teleporting issues

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Dinnerbone 2011-02-06 02:04:15 +00:00
Ursprung 4c9f1a2275
Commit 590b3874a8
2 geänderte Dateien mit 18 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/main/java/net/minecraft/server/ServerConfigurationManager.java
Datei anzeigen

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

23
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
Datei anzeigen

@ -8,6 +8,8 @@ import net.minecraft.server.ItemInWorldManager;
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.Packet9Respawn;
import net.minecraft.server.ServerConfigurationManager;
import net.minecraft.server.WorldServer; import net.minecraft.server.WorldServer;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
@ -115,18 +117,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public void teleportTo(Location location) { public void teleportTo(Location location) {
boolean worldChange = location.getWorld() != getWorld(); boolean worldChange = location.getWorld() != getWorld();
ServerConfigurationManager manager = server.getHandle();
if (worldChange) { if (worldChange) {
// Unload player from current chunks manager.c.k.a(entity);
server.getServer().f.d.b(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 = new ItemInWorldManager(((CraftWorld)location.getWorld()).getHandle());
entity.c.a = entity; 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) { if (worldChange) {
// Forceload the chunks around player manager.d.a(entity);
server.getServer().f.d.a(entity); entity.world.a(entity);
} }
} }
} }