Guest User

Untitled

a guest
Jan 21st, 2018
77
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.54 KB | None | 0 0
  1. diff --git a/net/minecraft/server/NetLoginHandler.java b/net/minecraft/server/NetLoginHandler.java
  2. index 0475a92..1fb5a78 100644
  3. --- a/net/minecraft/server/NetLoginHandler.java
  4. +++ b/net/minecraft/server/NetLoginHandler.java
  5. @@ -16,9 +16,9 @@ public class NetLoginHandler extends NetHandler
  6. private Packet1Login h = null;
  7. private String i = "";
  8.  
  9. - public NetLoginHandler(MinecraftServer minecraftserver, Socket socket, String s) {
  10. - this.e = minecraftserver;
  11. - this.b = new NetworkManager(socket, s, this);
  12. + public NetLoginHandler(MinecraftServer paramMinecraftServer, Socket paramSocket, String paramString) {
  13. + this.e = paramMinecraftServer;
  14. + this.b = new NetworkManager(paramSocket, paramString, this);
  15. this.b.d = 0;
  16. }
  17.  
  18. @@ -34,19 +34,19 @@ public class NetLoginHandler extends NetHandler
  19. this.b.a();
  20. }
  21.  
  22. - public void a(String s)
  23. + public void a(String paramString)
  24. {
  25. try {
  26. - a.info("Disconnecting " + b() + ": " + s);
  27. - this.b.a(new Packet255KickDisconnect(s));
  28. + a.info("Disconnecting " + b() + ": " + paramString);
  29. + this.b.a(new Packet255KickDisconnect(paramString));
  30. this.b.c();
  31. this.c = true;
  32. - } catch (Exception exception) {
  33. - exception.printStackTrace();
  34. + } catch (Exception localException) {
  35. + localException.printStackTrace();
  36. }
  37. }
  38.  
  39. - public void a(Packet2Handshake packet2handshake) {
  40. + public void a(Packet2Handshake paramPacket2Handshake) {
  41. if (this.e.l) {
  42. this.i = Long.toHexString(d.nextLong());
  43. this.b.a(new Packet2Handshake(this.i));
  44. @@ -55,50 +55,50 @@ public class NetLoginHandler extends NetHandler
  45. }
  46. }
  47.  
  48. - public void a(Packet1Login packet1login) {
  49. - this.g = packet1login.b;
  50. - if (packet1login.a != 9) {
  51. - if (packet1login.a > 9)
  52. + public void a(Packet1Login paramPacket1Login) {
  53. + this.g = paramPacket1Login.b;
  54. + if ((paramPacket1Login.a != 9) && (paramPacket1Login.a != 10)) {
  55. + if (paramPacket1Login.a > 10)
  56. a("Outdated server!");
  57. - else {
  58. + else if (paramPacket1Login.a < 9) {
  59. a("Outdated client!");
  60. }
  61. }
  62. else if (!this.e.l)
  63. - b(packet1login);
  64. + b(paramPacket1Login);
  65. else
  66. - new ThreadLoginVerifier(this, packet1login).start();
  67. + new ThreadLoginVerifier(this, paramPacket1Login).start();
  68. }
  69.  
  70. - public void b(Packet1Login packet1login)
  71. + public void b(Packet1Login paramPacket1Login)
  72. {
  73. - EntityPlayer entityplayer = this.e.f.a(this, packet1login.b, packet1login.c);
  74. -
  75. - if (entityplayer != null) {
  76. - a.info(b() + " logged in with entity id " + entityplayer.id);
  77. - NetServerHandler netserverhandler = new NetServerHandler(this.e, this.b, entityplayer);
  78. -
  79. - ChunkCoordinates chunkcoordinates = entityplayer.world.l();
  80. - netserverhandler.b(new Packet1Login("", "", entityplayer.id, entityplayer.world.j(), (byte)entityplayer.world.m.g));
  81. - netserverhandler.b(new Packet6SpawnPosition(chunkcoordinates.a, chunkcoordinates.b, chunkcoordinates.c));
  82. - this.e.f.a(new Packet3Chat("§e" + entityplayer.name + " joined the game."));
  83. - this.e.f.a(entityplayer);
  84. - netserverhandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
  85. - this.e.c.a(netserverhandler);
  86. - netserverhandler.b(new Packet4UpdateTime(entityplayer.world.k()));
  87. -
  88. - entityplayer.l();
  89. + EntityPlayer localEntityPlayer = this.e.f.a(this, paramPacket1Login.b, paramPacket1Login.c);
  90. +
  91. + if (localEntityPlayer != null) {
  92. + a.info(b() + " logged in with entity id " + localEntityPlayer.id);
  93. + NetServerHandler localNetServerHandler = new NetServerHandler(this.e, this.b, localEntityPlayer);
  94. +
  95. + ChunkCoordinates localChunkCoordinates = localEntityPlayer.world.l();
  96. + localNetServerHandler.b(new Packet1Login("", "", localEntityPlayer.id, localEntityPlayer.world.j(), (byte)localEntityPlayer.world.m.g));
  97. + localNetServerHandler.b(new Packet6SpawnPosition(localChunkCoordinates.a, localChunkCoordinates.b, localChunkCoordinates.c));
  98. + this.e.f.a(new Packet3Chat("§e" + localEntityPlayer.name + " joined the game."));
  99. + this.e.f.a(localEntityPlayer);
  100. + localNetServerHandler.a(localEntityPlayer.locX, localEntityPlayer.locY, localEntityPlayer.locZ, localEntityPlayer.yaw, localEntityPlayer.pitch);
  101. + this.e.c.a(localNetServerHandler);
  102. + localNetServerHandler.b(new Packet4UpdateTime(localEntityPlayer.world.k()));
  103. +
  104. + localEntityPlayer.l();
  105. }
  106.  
  107. this.c = true;
  108. }
  109.  
  110. - public void a(String s, Object[] aobject) {
  111. + public void a(String paramString, Object[] paramArrayOfObject) {
  112. a.info(b() + " lost connection");
  113. this.c = true;
  114. }
  115.  
  116. - public void a(Packet packet) {
  117. + public void a(Packet paramPacket) {
  118. a("Protocol error");
  119. }
  120.  
  121. @@ -106,11 +106,11 @@ public class NetLoginHandler extends NetHandler
  122. return this.g != null ? this.g + " [" + this.b.b().toString() + "]" : this.b.b().toString();
  123. }
  124.  
  125. - static String a(NetLoginHandler netloginhandler) {
  126. - return netloginhandler.i;
  127. + static String a(NetLoginHandler paramNetLoginHandler) {
  128. + return paramNetLoginHandler.i;
  129. }
  130.  
  131. - static Packet1Login a(NetLoginHandler netloginhandler, Packet1Login packet1login) {
  132. - return netloginhandler.h = packet1login;
  133. + static Packet1Login a(NetLoginHandler paramNetLoginHandler, Packet1Login paramPacket1Login) {
  134. + return paramNetLoginHandler.h = paramPacket1Login;
  135. }
  136. }
  137. \ No newline at end of file
Add Comment
Please, Sign In to add comment