summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ServerConfigurationManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/ServerConfigurationManager.java')
-rw-r--r--src/main/java/net/minecraft/server/ServerConfigurationManager.java82
1 files changed, 56 insertions, 26 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index 6fe2cbd8..b310bcc4 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -78,6 +78,12 @@ public class ServerConfigurationManager {
public void a(EntityPlayer entityplayer) {
// Craftbukkit - removed playermanagers
+ for(WorldServer world : this.server.worlds) {
+ if(world.manager.a.contains(entityplayer)) {
+ world.manager.removePlayer(entityplayer);
+ break;
+ }
+ }
this.a(entityplayer.dimension).addPlayer(entityplayer);
WorldServer worldserver = this.server.a(entityplayer.dimension);
@@ -192,39 +198,51 @@ public class ServerConfigurationManager {
// CraftBukkit end
}
+ // CraftBukkit start
public EntityPlayer a(EntityPlayer entityplayer, int i) {
+ return a(entityplayer, i, true);
+ }
+
+ public EntityPlayer a(EntityPlayer entityplayer, int i, boolean spawn) {
this.server.b(entityplayer.dimension).trackPlayer(entityplayer);
this.server.b(entityplayer.dimension).untrackEntity(entityplayer);
this.a(entityplayer.dimension).removePlayer(entityplayer);
this.players.remove(entityplayer);
this.server.a(entityplayer.dimension).removeEntity(entityplayer);
- ChunkCoordinates chunkcoordinates = entityplayer.K();
+ ChunkCoordinates chunkcoordinates = entityplayer.M();
entityplayer.dimension = i;
EntityPlayer entityplayer1 = new EntityPlayer(this.server, this.server.a(entityplayer.dimension), entityplayer.name, new ItemInWorldManager(this.server.a(entityplayer.dimension)));
entityplayer1.id = entityplayer.id;
entityplayer1.netServerHandler = entityplayer.netServerHandler;
+ entityplayer1.netServerHandler.player = entityplayer1;
WorldServer worldserver = this.server.a(entityplayer.dimension);
- // CraftBukkit start - transfer internal variables
+ entityplayer1.dimension = i;
entityplayer1.displayName = entityplayer.displayName;
entityplayer1.compassTarget = entityplayer.compassTarget;
entityplayer1.fauxSleeping = entityplayer.fauxSleeping;
- // CraftBukkit end
- if (chunkcoordinates != null) {
- ChunkCoordinates chunkcoordinates1 = EntityHuman.getBed(this.server.a(entityplayer.dimension), chunkcoordinates);
+ if (spawn) {
+ if(chunkcoordinates != null) {
+ ChunkCoordinates chunkcoordinates1 = EntityHuman.getBed(this.server.a(entityplayer.dimension), chunkcoordinates);
- if (chunkcoordinates1 != null) {
- entityplayer1.setPositionRotation((double) ((float) chunkcoordinates1.x + 0.5F), (double) ((float) chunkcoordinates1.y + 0.1F), (double) ((float) chunkcoordinates1.z + 0.5F), 0.0F, 0.0F);
- entityplayer1.a(chunkcoordinates);
- } else {
- entityplayer1.netServerHandler.sendPacket(new Packet70Bed(0));
+ if (chunkcoordinates1 != null) {
+ entityplayer1.setPositionRotation((double) ((float) chunkcoordinates1.x + 0.5F), (double) ((float) chunkcoordinates1.y + 0.1F), (double) ((float) chunkcoordinates1.z + 0.5F), 0.0F, 0.0F);
+ entityplayer1.a(chunkcoordinates);
+ } else {
+ entityplayer1.netServerHandler.sendPacket(new Packet70Bed(0));
+ }
}
}
+ else {
+ entityplayer1.setPositionRotation(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
+ entityplayer1.inventory = entityplayer.inventory;
+ entityplayer1.activeContainer = entityplayer.activeContainer;
+ entityplayer1.defaultContainer = entityplayer.defaultContainer;
+ }
- // CraftBukkit start
Player respawnPlayer = cserver.getPlayer(entityplayer);
Location respawnLocation = new Location(respawnPlayer.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
@@ -245,18 +263,22 @@ public class ServerConfigurationManager {
entityplayer1.setPosition(entityplayer1.locX, entityplayer1.locY + 1.0D, entityplayer1.locZ);
}
- entityplayer1.netServerHandler.sendPacket(new Packet9Respawn((byte) ((WorldServer)entityplayer1.world).getWorld().getEnvironment().getId()));
+ byte actualDimension = (byte) (worldserver.getWorld().getEnvironment().getId());
+ entityplayer1.netServerHandler.sendPacket(new Packet9Respawn((byte) (actualDimension >= 0 ? -1 : 0))); // CraftBukkit
+ entityplayer1.netServerHandler.sendPacket(new Packet9Respawn(actualDimension)); // CraftBukkit
entityplayer1.netServerHandler.a(entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
this.a(entityplayer1, worldserver);
this.a(entityplayer1.dimension).addPlayer(entityplayer1);
worldserver.addEntity(entityplayer1);
this.players.add(entityplayer1);
- entityplayer1.syncInventory();
+ if (spawn) entityplayer1.syncInventory(); // CraftBukkit
+ entityplayer1.a(entityplayer1.activeContainer);
entityplayer1.w();
return entityplayer1;
}
- public void f(EntityPlayer entityplayer) {
+ // CraftBukkit - changed signature
+ public EntityPlayer f(EntityPlayer entityplayer) {
WorldServer worldserver = this.server.a(entityplayer.dimension);
boolean flag = false;
byte b0;
@@ -267,47 +289,50 @@ public class ServerConfigurationManager {
b0 = -1;
}
- entityplayer.dimension = b0;
- WorldServer worldserver1 = this.server.a(entityplayer.dimension);
+ // CraftBukkit start
+ // entityplayer.dimension = b0;
+ WorldServer worldserver1 = this.server.a(b0);
- // Craftbukkit
- entityplayer.netServerHandler.sendPacket(new Packet9Respawn((byte) ((WorldServer)entityplayer.world).getWorld().getEnvironment().getId()));
+ // entityplayer.netServerHandler.sendPacket(new Packet9Respawn((byte) ((WorldServer)entityplayer.world).getWorld().getEnvironment().getId()));
+ // Craftbukkit end
worldserver.removeEntity(entityplayer);
entityplayer.dead = false;
double d0 = entityplayer.locX;
double d1 = entityplayer.locZ;
double d2 = 8.0D;
- if (entityplayer.dimension == -1) {
+ if (b0 == -1) { // CraftBukkit
d0 /= d2;
d1 /= d2;
entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch);
- if (entityplayer.Q()) {
+ if (entityplayer.S()) {
worldserver.entityJoinedWorld(entityplayer, false);
}
} else {
d0 *= d2;
d1 *= d2;
entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch);
- if (entityplayer.Q()) {
+ if (entityplayer.S()) {
worldserver.entityJoinedWorld(entityplayer, false);
}
}
- if (entityplayer.Q()) {
- worldserver1.addEntity(entityplayer);
+ if (entityplayer.S()) {
+ // worldserver1.addEntity(entityplayer); // CraftBukkit
entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch);
worldserver1.entityJoinedWorld(entityplayer, false);
worldserver1.chunkProviderServer.a = true;
(new PortalTravelAgent()).a(worldserver1, entityplayer);
worldserver1.chunkProviderServer.a = false;
}
-
+ /* CraftBukkit start
this.a(entityplayer);
entityplayer.netServerHandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
entityplayer.a((World) worldserver1);
this.a(entityplayer, worldserver1);
- entityplayer.a(entityplayer.defaultContainer);
+ this.g(entityplayer);
+ */ // CraftBukkit end
+ return a(entityplayer, b0, false);
}
public void b() {
@@ -617,9 +642,14 @@ public class ServerConfigurationManager {
}
public void a(EntityPlayer entityplayer, WorldServer worldserver) {
+ entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(worldserver.getTime()));
if (worldserver.v()) {
- entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(worldserver.getTime()));
entityplayer.netServerHandler.sendPacket(new Packet70Bed(1));
}
}
+
+ public void g(EntityPlayer entityplayer) {
+ entityplayer.a(entityplayer.defaultContainer);
+ entityplayer.B();
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 18:28:58 +0000