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

Improved handling of being sent to your bed spawn if the world saved in your player.dat no longer exists.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EvilSeph 2011-06-10 06:33:25 -04:00
Ursprung a98f4f8934
Commit a9e7b56ef2
1 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
src/main/java/net/minecraft/server/EntityPlayer.java
Datei anzeigen

@ -64,22 +64,22 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void a(World world) { public void a(World world) {
super.a(world); super.a(world);
// CraftBukkit - world fallback code, either respawn location or global spawn // CraftBukkit - world fallback code, either respawn location or global spawn
if(world == null) { if (world == null) {
dead = false; dead = false;
ChunkCoordinates position = null; ChunkCoordinates position = null;
if (!spawnWorld.isEmpty()) { if (!spawnWorld.isEmpty()) {
CraftWorld cw = (CraftWorld)Bukkit.getServer().getWorld(spawnWorld); CraftWorld cw = (CraftWorld)Bukkit.getServer().getWorld(spawnWorld);
if (cw != null) { if (cw != null && M() != null) {
world = cw.getHandle(); world = cw.getHandle();
position = M(); position = EntityHuman.getBed(cw.getHandle(), M());
} }
} }
if (world == null) { if (world == null || position == null) {
world = ((CraftWorld)Bukkit.getServer().getWorlds().get(0)).getHandle(); world = ((CraftWorld)Bukkit.getServer().getWorlds().get(0)).getHandle();
position = world.getSpawn(); position = world.getSpawn();
} }
this.world = world; this.world = world;
setPosition(position.x, position.y, position.z); setPosition(position.x + 0.5, position.y, position.z + 0.5);
} }
this.dimension = ((WorldServer)this.world).dimension; this.dimension = ((WorldServer)this.world).dimension;
// CraftBukkit end // CraftBukkit end