Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/net/minecraft/server/NetLoginHandler.java b/net/minecraft/server/NetLoginHandler.java
- index 0475a92..1fb5a78 100644
- --- a/net/minecraft/server/NetLoginHandler.java
- +++ b/net/minecraft/server/NetLoginHandler.java
- @@ -16,9 +16,9 @@ public class NetLoginHandler extends NetHandler
- private Packet1Login h = null;
- private String i = "";
- - public NetLoginHandler(MinecraftServer minecraftserver, Socket socket, String s) {
- - this.e = minecraftserver;
- - this.b = new NetworkManager(socket, s, this);
- + public NetLoginHandler(MinecraftServer paramMinecraftServer, Socket paramSocket, String paramString) {
- + this.e = paramMinecraftServer;
- + this.b = new NetworkManager(paramSocket, paramString, this);
- this.b.d = 0;
- }
- @@ -34,19 +34,19 @@ public class NetLoginHandler extends NetHandler
- this.b.a();
- }
- - public void a(String s)
- + public void a(String paramString)
- {
- try {
- - a.info("Disconnecting " + b() + ": " + s);
- - this.b.a(new Packet255KickDisconnect(s));
- + a.info("Disconnecting " + b() + ": " + paramString);
- + this.b.a(new Packet255KickDisconnect(paramString));
- this.b.c();
- this.c = true;
- - } catch (Exception exception) {
- - exception.printStackTrace();
- + } catch (Exception localException) {
- + localException.printStackTrace();
- }
- }
- - public void a(Packet2Handshake packet2handshake) {
- + public void a(Packet2Handshake paramPacket2Handshake) {
- if (this.e.l) {
- this.i = Long.toHexString(d.nextLong());
- this.b.a(new Packet2Handshake(this.i));
- @@ -55,50 +55,50 @@ public class NetLoginHandler extends NetHandler
- }
- }
- - public void a(Packet1Login packet1login) {
- - this.g = packet1login.b;
- - if (packet1login.a != 9) {
- - if (packet1login.a > 9)
- + public void a(Packet1Login paramPacket1Login) {
- + this.g = paramPacket1Login.b;
- + if ((paramPacket1Login.a != 9) && (paramPacket1Login.a != 10)) {
- + if (paramPacket1Login.a > 10)
- a("Outdated server!");
- - else {
- + else if (paramPacket1Login.a < 9) {
- a("Outdated client!");
- }
- }
- else if (!this.e.l)
- - b(packet1login);
- + b(paramPacket1Login);
- else
- - new ThreadLoginVerifier(this, packet1login).start();
- + new ThreadLoginVerifier(this, paramPacket1Login).start();
- }
- - public void b(Packet1Login packet1login)
- + public void b(Packet1Login paramPacket1Login)
- {
- - EntityPlayer entityplayer = this.e.f.a(this, packet1login.b, packet1login.c);
- -
- - if (entityplayer != null) {
- - a.info(b() + " logged in with entity id " + entityplayer.id);
- - NetServerHandler netserverhandler = new NetServerHandler(this.e, this.b, entityplayer);
- -
- - ChunkCoordinates chunkcoordinates = entityplayer.world.l();
- - netserverhandler.b(new Packet1Login("", "", entityplayer.id, entityplayer.world.j(), (byte)entityplayer.world.m.g));
- - netserverhandler.b(new Packet6SpawnPosition(chunkcoordinates.a, chunkcoordinates.b, chunkcoordinates.c));
- - this.e.f.a(new Packet3Chat("§e" + entityplayer.name + " joined the game."));
- - this.e.f.a(entityplayer);
- - netserverhandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
- - this.e.c.a(netserverhandler);
- - netserverhandler.b(new Packet4UpdateTime(entityplayer.world.k()));
- -
- - entityplayer.l();
- + EntityPlayer localEntityPlayer = this.e.f.a(this, paramPacket1Login.b, paramPacket1Login.c);
- +
- + if (localEntityPlayer != null) {
- + a.info(b() + " logged in with entity id " + localEntityPlayer.id);
- + NetServerHandler localNetServerHandler = new NetServerHandler(this.e, this.b, localEntityPlayer);
- +
- + ChunkCoordinates localChunkCoordinates = localEntityPlayer.world.l();
- + localNetServerHandler.b(new Packet1Login("", "", localEntityPlayer.id, localEntityPlayer.world.j(), (byte)localEntityPlayer.world.m.g));
- + localNetServerHandler.b(new Packet6SpawnPosition(localChunkCoordinates.a, localChunkCoordinates.b, localChunkCoordinates.c));
- + this.e.f.a(new Packet3Chat("§e" + localEntityPlayer.name + " joined the game."));
- + this.e.f.a(localEntityPlayer);
- + localNetServerHandler.a(localEntityPlayer.locX, localEntityPlayer.locY, localEntityPlayer.locZ, localEntityPlayer.yaw, localEntityPlayer.pitch);
- + this.e.c.a(localNetServerHandler);
- + localNetServerHandler.b(new Packet4UpdateTime(localEntityPlayer.world.k()));
- +
- + localEntityPlayer.l();
- }
- this.c = true;
- }
- - public void a(String s, Object[] aobject) {
- + public void a(String paramString, Object[] paramArrayOfObject) {
- a.info(b() + " lost connection");
- this.c = true;
- }
- - public void a(Packet packet) {
- + public void a(Packet paramPacket) {
- a("Protocol error");
- }
- @@ -106,11 +106,11 @@ public class NetLoginHandler extends NetHandler
- return this.g != null ? this.g + " [" + this.b.b().toString() + "]" : this.b.b().toString();
- }
- - static String a(NetLoginHandler netloginhandler) {
- - return netloginhandler.i;
- + static String a(NetLoginHandler paramNetLoginHandler) {
- + return paramNetLoginHandler.i;
- }
- - static Packet1Login a(NetLoginHandler netloginhandler, Packet1Login packet1login) {
- - return netloginhandler.h = packet1login;
- + static Packet1Login a(NetLoginHandler paramNetLoginHandler, Packet1Login paramPacket1Login) {
- + return paramNetLoginHandler.h = paramPacket1Login;
- }
- }
- \ No newline at end of file
Add Comment
Please, Sign In to add comment