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

Made teleporting between worlds 'smoother'. Thanks Raphfrk!

Browse source
This commit is contained in:
EvilSeph 2011-05-04 22:16:26 -04:00
parent ef7e3689b3
commit 54e2254904
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/minecraft/server/PlayerInstance.java
View file

@ -37,8 +37,11 @@ class PlayerInstance {
if (this.b.contains(entityplayer)) { if (this.b.contains(entityplayer)) {
throw new IllegalStateException("Failed to add player. " + entityplayer + " already is in chunk " + this.chunkX + ", " + this.chunkZ); throw new IllegalStateException("Failed to add player. " + entityplayer + " already is in chunk " + this.chunkX + ", " + this.chunkZ);
} else { } else {
entityplayer.g.add(this.e); // CraftBukkit start
if (entityplayer.g.add(this.e)) {
entityplayer.netServerHandler.sendPacket(new Packet50PreChunk(this.e.x, this.e.z, true)); entityplayer.netServerHandler.sendPacket(new Packet50PreChunk(this.e.x, this.e.z, true));
}
// CraftBukkit end
this.b.add(entityplayer); this.b.add(entityplayer);
entityplayer.f.add(this.e); entityplayer.f.add(this.e);
} }
@ -63,7 +66,7 @@ class PlayerInstance {
} }
entityplayer.f.remove(this.e); entityplayer.f.remove(this.e);
if (entityplayer.g.contains(this.e)) { if (entityplayer.g.remove(this.e)) { // CraftBukkit - contains -> remove
entityplayer.netServerHandler.sendPacket(new Packet50PreChunk(this.chunkX, this.chunkZ, false)); entityplayer.netServerHandler.sendPacket(new Packet50PreChunk(this.chunkX, this.chunkZ, false));
} }
} }

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

@ -12,6 +12,7 @@ import net.minecraft.server.Packet54PlayNoteBlock;
import net.minecraft.server.Packet6SpawnPosition; import net.minecraft.server.Packet6SpawnPosition;
import net.minecraft.server.ServerConfigurationManager; import net.minecraft.server.ServerConfigurationManager;
import net.minecraft.server.WorldServer; import net.minecraft.server.WorldServer;
import net.minecraft.server.ChunkCoordIntPair;
import org.bukkit.Achievement; import org.bukkit.Achievement;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -194,6 +195,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (teleportSuccess) { if (teleportSuccess) {
manager.server.tracker.trackPlayer(entity); manager.server.tracker.trackPlayer(entity);
manager.server.tracker.untrackEntity(entity); manager.server.tracker.untrackEntity(entity);
int cx = (int) location.getBlockX() >> 4;
int cz = (int) location.getBlockZ() >> 4;
for (int x = -10 ; x <= 10 ; x++ ) {
for (int z = -10 ; z <= 10 ; z++ ) {
ChunkCoordIntPair chunkPosition = new ChunkCoordIntPair(cx + x, cz + z);
if (entity.g.remove(chunkPosition)) {
newEntity.g.add(chunkPosition);
}
}
}
oldWorld.manager.removePlayer(entity); oldWorld.manager.removePlayer(entity);
manager.players.remove(entity); manager.players.remove(entity);
oldWorld.removeEntity(entity); oldWorld.removeEntity(entity);