Merge & resolve conflicts
This commit is contained in:
@@ -48,8 +48,8 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
|
||||
Player player = playerManager.getPlayer(packet.getPlayerName())
|
||||
.orElseGet(() -> playerManager.createPlayer(
|
||||
packet.getPlayerName(),
|
||||
world.getSpawn().getLocation(),
|
||||
world.getSpawn().getLook()));
|
||||
world.getSpawn(),
|
||||
new Look(0f, 0f)));
|
||||
|
||||
channel.writeAndFlush(new LoginSuccessPacket(
|
||||
player.getUUID(),
|
||||
@@ -68,7 +68,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
|
||||
|
||||
// Spawn Position
|
||||
SpawnPositionPacket pkt2 = new SpawnPositionPacket();
|
||||
pkt2.setLocation(world.getSpawn().getLocation());
|
||||
pkt2.setLocation(world.getSpawn());
|
||||
channel.write(pkt2);
|
||||
|
||||
// Player Abilities
|
||||
@@ -80,6 +80,14 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
|
||||
channel.write(pkt3);
|
||||
channel.flush();
|
||||
|
||||
// One Chunk
|
||||
ChunkDataPacket pkt8 = new ChunkDataPacket();
|
||||
pkt8.setX(0);
|
||||
pkt8.setZ(0);
|
||||
pkt8.getChunks().add(world.getChunk(0, 0,0));
|
||||
pkt8.setInitChunk(true);
|
||||
channel.writeAndFlush(pkt8);
|
||||
|
||||
// Player Position And Look
|
||||
PlayerPositionAndLookPacket pkt4 = new PlayerPositionAndLookPacket();
|
||||
pkt4.setLocation(player.getLocation());
|
||||
|
||||
Reference in New Issue
Block a user