diff --git a/server/src/main/java/net/minecraft/server/MinecraftServer.java b/server/src/main/java/net/minecraft/server/MinecraftServer.java index 1fda8fa..be47d20 100644 --- a/server/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/server/src/main/java/net/minecraft/server/MinecraftServer.java @@ -95,9 +95,6 @@ public class MinecraftServer implements Runnable, ICommandListener, IServer private List commands; public EntityTracker entityTracker[]; - /** True if the server is in online mode. */ - public boolean onlineMode; - /** True if server has animals turned on */ public boolean spawnPeacefulMobs; public boolean field_44002_p; @@ -160,7 +157,6 @@ public class MinecraftServer implements Runnable, ICommandListener, IServer logger.info("Loading properties"); propertyManagerObj = new PropertyManager(new File("server.properties")); hostname = propertyManagerObj.getStringProperty("server-ip", ""); - onlineMode = propertyManagerObj.getBooleanProperty("online-mode", true); spawnPeacefulMobs = propertyManagerObj.getBooleanProperty("spawn-animals", true); field_44002_p = propertyManagerObj.getBooleanProperty("spawn-npcs", true); pvpOn = propertyManagerObj.getBooleanProperty("pvp", true); @@ -189,14 +185,6 @@ public class MinecraftServer implements Runnable, ICommandListener, IServer return false; } - if (!onlineMode) - { - logger.warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); - logger.warning("The server will make no attempt to authenticate usernames. Beware."); - logger.warning("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose."); - logger.warning("To change this, set \"online-mode\" to \"true\" in the server.settings file."); - } - configManager = new ServerConfigurationManager(this); entityTracker[0] = new EntityTracker(this, 0); entityTracker[1] = new EntityTracker(this, -1); diff --git a/server/src/main/java/net/minecraft/src/NetLoginHandler.java b/server/src/main/java/net/minecraft/src/NetLoginHandler.java index 7c520dd..dcf4cd9 100644 --- a/server/src/main/java/net/minecraft/src/NetLoginHandler.java +++ b/server/src/main/java/net/minecraft/src/NetLoginHandler.java @@ -10,6 +10,7 @@ import ru.di9.minecraft.shared.network.packet.*; import ru.di9.minecraft.shared.potion.PotionEffect; import ru.di9.minecraft.shared.network.*; +@SuppressWarnings("all") public class NetLoginHandler extends NetHandler { /** The Minecraft logger. */ @@ -98,15 +99,7 @@ public class NetLoginHandler extends NetHandler public void handleHandshake(Packet2Handshake par1Packet2Handshake) { - if (mcServer.onlineMode) - { - serverId = Long.toString(rand.nextLong(), 16); - netManager.addToSendQueue(new Packet2Handshake(serverId)); - } - else - { - netManager.addToSendQueue(new Packet2Handshake("-")); - } + netManager.addToSendQueue(new Packet2Handshake("-")); } public void handleLogin(Packet1Login par1Packet1Login) @@ -127,14 +120,7 @@ public class NetLoginHandler extends NetHandler return; } - if (!mcServer.onlineMode) - { - doLogin(par1Packet1Login); - } - else - { - (new ThreadLoginVerifier(this, par1Packet1Login)).start(); - } + doLogin(par1Packet1Login); } /** diff --git a/server/src/main/java/net/minecraft/src/ServerConfigurationManager.java b/server/src/main/java/net/minecraft/src/ServerConfigurationManager.java index 71d98c8..afb00cf 100644 --- a/server/src/main/java/net/minecraft/src/ServerConfigurationManager.java +++ b/server/src/main/java/net/minecraft/src/ServerConfigurationManager.java @@ -12,6 +12,7 @@ import ru.di9.minecraft.shared.network.packet.*; import ru.di9.minecraft.shared.player.IPlayerFileData; import ru.di9.minecraft.shared.player.PlayerUsageSnooper; +@SuppressWarnings("all") public class ServerConfigurationManager { /** Reference to the logger. */ @@ -926,7 +927,6 @@ public class ServerConfigurationManager playerusagesnooper.func_021y("players_current", Integer.valueOf(playersOnline())); playerusagesnooper.func_021y("players_max", Integer.valueOf(getMaxPlayers())); playerusagesnooper.func_021y("players_seen", Integer.valueOf(func_52019_t().length)); - playerusagesnooper.func_021y("uses_auth", Boolean.valueOf(mcServer.onlineMode)); playerusagesnooper.func_021y("server_brand", mcServer.func_52003_getServerModName()); playerusagesnooper.func_022y(); } diff --git a/server/src/main/java/net/minecraft/src/ThreadLoginVerifier.java b/server/src/main/java/net/minecraft/src/ThreadLoginVerifier.java deleted file mode 100644 index 5dafed9..0000000 --- a/server/src/main/java/net/minecraft/src/ThreadLoginVerifier.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.minecraft.src; - -import ru.di9.minecraft.shared.network.packet.Packet1Login; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLEncoder; - -class ThreadLoginVerifier extends Thread -{ - /** The login packet to be verified. */ - final Packet1Login loginPacket; - - /** The login handler that spawned this thread. */ - final NetLoginHandler loginHandler; - - ThreadLoginVerifier(NetLoginHandler par1NetLoginHandler, Packet1Login par2Packet1Login) - { - loginHandler = par1NetLoginHandler; - loginPacket = par2Packet1Login; - } - - public void run() - { - try - { - String s = NetLoginHandler.getServerId(loginHandler); - URL url = new URL((new StringBuilder()).append("http://session.minecraft.net/game/checkserver.jsp?user=").append(URLEncoder.encode(loginPacket.username, "UTF-8")).append("&serverId=").append(URLEncoder.encode(s, "UTF-8")).toString()); - BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(url.openStream())); - String s1 = bufferedreader.readLine(); - bufferedreader.close(); - - if (s1.equals("YES")) - { - NetLoginHandler.setLoginPacket(loginHandler, loginPacket); - } - else - { - loginHandler.kickUser("Failed to verify username!"); - } - } - catch (Exception exception) - { - loginHandler.kickUser((new StringBuilder()).append("Failed to verify username! [internal error ").append(exception).append("]").toString()); - exception.printStackTrace(); - } - } -}