From c49239fa8c58fee429fc1101aa63ca14178d1e82 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Tue, 28 Dec 2010 20:52:24 +0100 Subject: [PATCH] Moved from jd-gui to jad --- src/net/minecraft/server/MinecraftServer.java | 596 +++++++++--------- .../server/ServerConfigurationManager.java | 389 ++++++------ 2 files changed, 511 insertions(+), 474 deletions(-) diff --git a/src/net/minecraft/server/MinecraftServer.java b/src/net/minecraft/server/MinecraftServer.java index fdb5213c62..8d49cfa69e 100644 --- a/src/net/minecraft/server/MinecraftServer.java +++ b/src/net/minecraft/server/MinecraftServer.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import java.awt.GraphicsEnvironment; + import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -9,83 +9,84 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; + import org.bukkit.craftbukkit.CraftServer; + public class MinecraftServer implements ICommandListener, Runnable { public static Logger a = Logger.getLogger("Minecraft"); - public static HashMap b = new HashMap(); + public static HashMap b = new HashMap(); public NetworkListenThread c; public PropertyManager d; public WorldServer e; public ServerConfigurationManager f; - private boolean o = true; - public boolean g = false; - int h = 0; + private boolean o; + public boolean g; + int h; public String i; public int j; - private List p = new ArrayList(); - private List q = Collections.synchronizedList(new ArrayList()); + private List p; + private List q; public EntityTracker k; public boolean l; public boolean m; public boolean n; + public CraftServer server; // CraftBukkit public MinecraftServer() { + o = true; + g = false; + h = 0; + p = new ArrayList(); + q = Collections.synchronizedList(new ArrayList()); new ThreadSleepForever(this); } - // CraftBukkit: Decompiler might miss this method, your IDE won't complain but you - // can't run without it! - public static boolean a(MinecraftServer minecraftserver) - { - return minecraftserver.o; - } - + // CraftBukkit: added throws UnknownHostException private boolean d() throws UnknownHostException { - ThreadCommandReader localThreadCommandReader = new ThreadCommandReader(this); - - localThreadCommandReader.setDaemon(true); - localThreadCommandReader.start(); + ThreadCommandReader threadcommandreader = new ThreadCommandReader(this); + threadcommandreader.setDaemon(true); + threadcommandreader.start(); ConsoleLogManager.a(); a.info("Starting minecraft server version Beta 1.1_02"); - if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { a.warning("**** NOT ENOUGH RAM!"); a.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } - a.info("Loading properties"); - this.d = new PropertyManager(new File("server.properties")); - String str1 = this.d.a("server-ip", ""); + d = new PropertyManager(new File("server.properties")); + String s = d.a("server-ip", ""); - this.l = this.d.a("online-mode", true); - this.m = this.d.a("spawn-animals", true); - this.n = this.d.a("pvp", true); + l = d.a("online-mode", true); + m = d.a("spawn-animals", true); + n = d.a("pvp", true); + InetAddress inetaddress = null; - InetAddress localInetAddress = null; - if (str1.length() > 0) { - localInetAddress = InetAddress.getByName(str1); + if (s.length() > 0) { + inetaddress = InetAddress.getByName(s); } - int i1 = this.d.a("server-port", 25565); + int i1 = d.a("server-port", 25565); - a.info("Starting Minecraft server on " + (str1.length() == 0 ? "*" : str1) + ":" + i1); + a.info((new StringBuilder()).append("Starting Minecraft server on ").append(s.length() != 0 ? s : "*").append(":").append(i1).toString()); try { - this.c = new NetworkListenThread(this, localInetAddress, i1); - } catch (Throwable localIOException) { + c = new NetworkListenThread(this, inetaddress, i1); + // CraftBukkit: Be more generic; IOException -> Throwable + } catch (Throwable ioexception) { a.warning("**** FAILED TO BIND TO PORT!"); - a.log(Level.WARNING, "The exception was: " + localIOException.toString()); + a.log(Level.WARNING, (new StringBuilder()).append("The exception was: ").append(ioexception.toString()).toString()); a.warning("Perhaps a server is already running on that port?"); return false; } - - if (!this.l) { + if (!l) { a.warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); a.warning("The server will make no attempt to authenticate usernames. Beware."); a.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."); @@ -94,64 +95,66 @@ public class MinecraftServer server = new CraftServer(this, "1.1"); // CraftBukkit - this.f = new ServerConfigurationManager(this); - this.k = new EntityTracker(this); + f = new ServerConfigurationManager(this); + k = new EntityTracker(this); + String s1 = d.a("level-name", "world"); - String str2 = this.d.a("level-name", "world"); - a.info("Preparing level \"" + str2 + "\""); - c(str2); + a.info((new StringBuilder()).append("Preparing level \"").append(s1).append("\"").toString()); + c(s1); a.info("Done! For help, type \"help\" or \"?\""); - return true; } - private void c(String paramString) { + private void c(String s) { a.info("Preparing start region"); - this.e = new WorldServer(this, new File("."), paramString, this.d.a("hellworld", false) ? -1 : 0); - this.e.a(new WorldManager(this)); - this.e.k = (this.d.a("spawn-monsters", true) ? 1 : 0); - this.f.a(this.e); - int i1 = 10; - for (int i2 = -i1; i2 <= i1; i2++) { - a("Preparing spawn area", (i2 + i1) * 100 / (i1 + i1 + 1)); - for (int i3 = -i1; i3 <= i1; i3++) { - if (!this.o) { + e = new WorldServer(this, new File("."), s, d.a("hellworld", false) ? -1 : 0); + e.a(new WorldManager(this)); + e.k = d.a("spawn-monsters", true) ? 1 : 0; + f.a(e); + byte byte0 = 10; + + for (int i1 = -byte0; i1 <= byte0; i1++) { + a("Preparing spawn area", ((i1 + byte0) * 100) / (byte0 + byte0 + 1)); + for (int j1 = -byte0; j1 <= byte0; j1++) { + if (!o) { return; } - this.e.A.d((this.e.m >> 4) + i2, (this.e.o >> 4) + i3); + e.A.d((e.m >> 4) + i1, (e.o >> 4) + j1); } + } + e(); } - private void a(String paramString, int paramInt) { - this.i = paramString; - this.j = paramInt; - System.out.println(paramString + ": " + paramInt + "%"); + private void a(String s, int i1) { + i = s; + j = i1; + System.out.println((new StringBuilder()).append(s).append(": ").append(i1).append("%").toString()); } private void e() { - this.i = null; - this.j = 0; + i = null; + j = 0; } private void f() { a.info("Saving chunks"); - this.e.a(true, null); + e.a(true, null); } private void g() { a.info("Stopping server"); - if (this.f != null) { - this.f.d(); + if (f != null) { + f.d(); } - if (this.e != null) { + if (e != null) { f(); } } public void a() { - this.o = false; + o = false; } public void run() { @@ -159,9 +162,11 @@ public class MinecraftServer if (d()) { long l1 = System.currentTimeMillis(); long l2 = 0L; - while (this.o) { + + while (o) { long l3 = System.currentTimeMillis(); long l4 = l3 - l1; + if (l4 > 2000L) { a.warning("Can't keep up! Did the system time change, or is the server overloaded?"); l4 = 2000L; @@ -172,300 +177,311 @@ public class MinecraftServer } l2 += l4; l1 = l3; - while (l2 > 50L) { l2 -= 50L; h(); } - Thread.sleep(1L); } } else { - while (this.o) { + while (o) { b(); try { Thread.sleep(10L); - } catch (InterruptedException localInterruptedException1) { - localInterruptedException1.printStackTrace(); + } catch (InterruptedException interruptedexception) { + interruptedexception.printStackTrace(); } } } - } catch (Exception localException) { - localException.printStackTrace(); - a.log(Level.SEVERE, "Unexpected exception", localException); - while (this.o) { + } catch (Exception exception) { + exception.printStackTrace(); + a.log(Level.SEVERE, "Unexpected exception", exception); + while (o) { b(); try { Thread.sleep(10L); - } catch (InterruptedException localInterruptedException2) { - localInterruptedException2.printStackTrace(); + } catch (InterruptedException interruptedexception1) { + interruptedexception1.printStackTrace(); } } } finally { g(); - this.g = true; + g = true; System.exit(0); } } private void h() { - ArrayList localArrayList = new ArrayList(); - for (String str : b.keySet()) { - int i2 = ((Integer) b.get(str)).intValue(); - if (i2 > 0) { - b.put(str, Integer.valueOf(i2 - 1)); + ArrayList arraylist = new ArrayList(); + + for (Iterator iterator = b.keySet().iterator(); iterator.hasNext();) { + String s = (String) iterator.next(); + int k1 = ((Integer) b.get(s)).intValue(); + + if (k1 > 0) { + b.put(s, Integer.valueOf(k1 - 1)); } else { - localArrayList.add(str); + arraylist.add(s); } } - for (int i1 = 0; i1 < localArrayList.size(); i1++) { - b.remove(localArrayList.get(i1)); + + for (int i1 = 0; i1 < arraylist.size(); i1++) { + b.remove(arraylist.get(i1)); } AxisAlignedBB.a(); Vec3D.a(); - this.h += 1; - - if (this.h % 20 == 0) { - this.f.a(new Packet4UpdateTime(this.e.e)); + h++; + if (h % 20 == 0) { + f.a(new Packet4UpdateTime(e.e)); + } + e.f(); + while (e.d()) { + ; + } + e.c(); + c.a(); + f.b(); + k.a(); + for (int j1 = 0; j1 < p.size(); j1++) { + ((IUpdatePlayerListBox) p.get(j1)).a(); } - this.e.f(); - while (this.e.d()); - this.e.c(); - this.c.a(); - this.f.b(); - this.k.a(); - - for (int i1 = 0; i1 < this.p.size(); i1++) { - ((IUpdatePlayerListBox) this.p.get(i1)).a(); - } try { b(); - } catch (Exception localException) { - a.log(Level.WARNING, "Unexpected exception while parsing console command", localException); + } catch (Exception exception) { + a.log(Level.WARNING, "Unexpected exception while parsing console command", exception); } } - public void a(String paramString, ICommandListener paramICommandListener) { - this.q.add(new ServerCommand(paramString, paramICommandListener)); + public void a(String s, ICommandListener icommandlistener) { + q.add(new ServerCommand(s, icommandlistener)); } public void b() { - while (this.q.size() > 0) { - ServerCommand localServerCommand = (ServerCommand) this.q.remove(0); - String str1 = localServerCommand.a; - ICommandListener localICommandListener = localServerCommand.b; - String str2 = localICommandListener.c(); - if ((str1.toLowerCase().startsWith("help")) || (str1.toLowerCase().startsWith("?"))) { - localICommandListener.b("To run the server without a gui, start it like this:"); - localICommandListener.b(" java -Xmx1024M -Xms1024M -jar minecraft_server.jar nogui"); - localICommandListener.b("Console commands:"); - localICommandListener.b(" help or ? shows this message"); - localICommandListener.b(" kick removes a player from the server"); - localICommandListener.b(" ban bans a player from the server"); - localICommandListener.b(" pardon pardons a banned player so that they can connect again"); - localICommandListener.b(" ban-ip bans an IP address from the server"); - localICommandListener.b(" pardon-ip pardons a banned IP address so that they can connect again"); - localICommandListener.b(" op turns a player into an op"); - localICommandListener.b(" deop removes op status from a player"); - localICommandListener.b(" tp moves one player to the same location as another player"); - localICommandListener.b(" give [num] gives a player a resource"); - localICommandListener.b(" tell sends a private message to a player"); - localICommandListener.b(" stop gracefully stops the server"); - localICommandListener.b(" save-all forces a server-wide level save"); - localICommandListener.b(" save-off disables terrain saving (useful for backup scripts)"); - localICommandListener.b(" save-on re-enables terrain saving"); - localICommandListener.b(" list lists all currently connected players"); - localICommandListener.b(" say broadcasts a message to all players"); - } else if (str1.toLowerCase().startsWith("list")) { - localICommandListener.b("Connected players: " + this.f.c()); - } else if (str1.toLowerCase().startsWith("stop")) { - a(str2, "Stopping the server.."); - this.o = false; - } else if (str1.toLowerCase().startsWith("save-all")) { - a(str2, "Forcing save.."); - this.e.a(true, null); - a(str2, "Save complete."); - } else if (str1.toLowerCase().startsWith("save-off")) { - a(str2, "Disabling level saving.."); - this.e.C = true; - } else if (str1.toLowerCase().startsWith("save-on")) { - a(str2, "Enabling level saving.."); - this.e.C = false; - } else { - Object localObject1; - if (str1.toLowerCase().startsWith("op ")) { - localObject1 = str1.substring(str1.indexOf(" ")).trim(); - this.f.e((String) localObject1); - a(str2, "Opping " + (String) localObject1); - this.f.a((String) localObject1, "§eYou are now op!"); - } else if (str1.toLowerCase().startsWith("deop ")) { - localObject1 = str1.substring(str1.indexOf(" ")).trim(); - this.f.f((String) localObject1); - this.f.a((String) localObject1, "§eYou are no longer op!"); - a(str2, "De-opping " + (String) localObject1); - } else if (str1.toLowerCase().startsWith("ban-ip ")) { - localObject1 = str1.substring(str1.indexOf(" ")).trim(); - this.f.c((String) localObject1); - a(str2, "Banning ip " + (String) localObject1); - } else if (str1.toLowerCase().startsWith("pardon-ip ")) { - localObject1 = str1.substring(str1.indexOf(" ")).trim(); - this.f.d((String) localObject1); - a(str2, "Pardoning ip " + (String) localObject1); - } else { - Object localObject2; - if (str1.toLowerCase().startsWith("ban ")) { - localObject1 = str1.substring(str1.indexOf(" ")).trim(); - this.f.a((String) localObject1); - a(str2, "Banning " + (String) localObject1); + do { + if (q.size() <= 0) { + break; + } + ServerCommand servercommand = (ServerCommand) q.remove(0); + String s = servercommand.a; + ICommandListener icommandlistener = servercommand.b; + String s1 = icommandlistener.c(); - localObject2 = this.f.h((String) localObject1); + if (s.toLowerCase().startsWith("help") || s.toLowerCase().startsWith("?")) { + icommandlistener.b("To run the server without a gui, start it like this:"); + icommandlistener.b(" java -Xmx1024M -Xms1024M -jar minecraft_server.jar nogui"); + icommandlistener.b("Console commands:"); + icommandlistener.b(" help or ? shows this message"); + icommandlistener.b(" kick removes a player from the server"); + icommandlistener.b(" ban bans a player from the server"); + icommandlistener.b(" pardon pardons a banned player so that they can connect again"); + icommandlistener.b(" ban-ip bans an IP address from the server"); + icommandlistener.b(" pardon-ip pardons a banned IP address so that they can connect again"); + icommandlistener.b(" op turns a player into an op"); + icommandlistener.b(" deop removes op status from a player"); + icommandlistener.b(" tp moves one player to the same location as another player"); + icommandlistener.b(" give [num] gives a player a resource"); + icommandlistener.b(" tell sends a private message to a player"); + icommandlistener.b(" stop gracefully stops the server"); + icommandlistener.b(" save-all forces a server-wide level save"); + icommandlistener.b(" save-off disables terrain saving (useful for backup scripts)"); + icommandlistener.b(" save-on re-enables terrain saving"); + icommandlistener.b(" list lists all currently connected players"); + icommandlistener.b(" say broadcasts a message to all players"); + } else if (s.toLowerCase().startsWith("list")) { + icommandlistener.b((new StringBuilder()).append("Connected players: ").append(f.c()).toString()); + } else if (s.toLowerCase().startsWith("stop")) { + a(s1, "Stopping the server.."); + o = false; + } else if (s.toLowerCase().startsWith("save-all")) { + a(s1, "Forcing save.."); + e.a(true, null); + a(s1, "Save complete."); + } else if (s.toLowerCase().startsWith("save-off")) { + a(s1, "Disabling level saving.."); + e.C = true; + } else if (s.toLowerCase().startsWith("save-on")) { + a(s1, "Enabling level saving.."); + e.C = false; + } else if (s.toLowerCase().startsWith("op ")) { + String s2 = s.substring(s.indexOf(" ")).trim(); - if (localObject2 != null) { - ((EntityPlayerMP) localObject2).a.a("Banned by admin"); - } + f.e(s2); + a(s1, (new StringBuilder()).append("Opping ").append(s2).toString()); + f.a(s2, "\247eYou are now op!"); + } else if (s.toLowerCase().startsWith("deop ")) { + String s3 = s.substring(s.indexOf(" ")).trim(); - } else if (str1.toLowerCase().startsWith("pardon ")) { - localObject1 = str1.substring(str1.indexOf(" ")).trim(); - this.f.b((String) localObject1); - a(str2, "Pardoning " + (String) localObject1); - } else if (str1.toLowerCase().startsWith("kick ")) { - localObject1 = str1.substring(str1.indexOf(" ")).trim(); - localObject2 = null; - for (int i1 = 0; i1 < this.f.b.size(); i1++) { - EntityPlayerMP localEntityPlayerMP2 = (EntityPlayerMP) this.f.b.get(i1); - if (localEntityPlayerMP2.aw.equalsIgnoreCase((String) localObject1)) { - localObject2 = localEntityPlayerMP2; - } - } + f.f(s3); + f.a(s3, "\247eYou are no longer op!"); + a(s1, (new StringBuilder()).append("De-opping ").append(s3).toString()); + } else if (s.toLowerCase().startsWith("ban-ip ")) { + String s4 = s.substring(s.indexOf(" ")).trim(); - if (localObject2 != null) { - ((EntityPlayerMP) localObject2).a.a("Kicked by admin"); - a(str2, "Kicking " + ((EntityPlayerMP) localObject2).aw); - } else { - localICommandListener.b("Can't find user " + (String) localObject1 + ". No kick."); - } - } else { - EntityPlayerMP localEntityPlayerMP1; - if (str1.toLowerCase().startsWith("tp ")) { - String[] split = str1.split(" "); - if (split.length == 3) { - localObject2 = this.f.h(split[1]); - localEntityPlayerMP1 = this.f.h(split[2]); + f.c(s4); + a(s1, (new StringBuilder()).append("Banning ip ").append(s4).toString()); + } else if (s.toLowerCase().startsWith("pardon-ip ")) { + String s5 = s.substring(s.indexOf(" ")).trim(); - if (localObject2 == null) { - localICommandListener.b("Can't find user " + split[1] + ". No tp."); - } else if (localEntityPlayerMP1 == null) { - localICommandListener.b("Can't find user " + split[2] + ". No tp."); - } else { - ((EntityPlayerMP) localObject2).a.a(localEntityPlayerMP1.p, localEntityPlayerMP1.q, localEntityPlayerMP1.r, localEntityPlayerMP1.v, localEntityPlayerMP1.w); - a(str2, "Teleporting " + split[1] + " to " + split[2] + "."); - } - } else { - localICommandListener.b("Syntax error, please provice a source and a target."); - } - } else if (str1.toLowerCase().startsWith("give ")) { - String[] split = str1.split(" "); - if ((split.length != 3) && (split.length != 4)) { - return; - } + f.d(s5); + a(s1, (new StringBuilder()).append("Pardoning ip ").append(s5).toString()); + } else if (s.toLowerCase().startsWith("ban ")) { + String s6 = s.substring(s.indexOf(" ")).trim(); - localObject2 = split[1]; - localEntityPlayerMP1 = this.f.h((String) localObject2); + f.a(s6); + a(s1, (new StringBuilder()).append("Banning ").append(s6).toString()); + EntityPlayerMP entityplayermp = f.h(s6); - if (localEntityPlayerMP1 != null) { - try { - int i2 = Integer.parseInt(split[2]); - if (Item.c[i2] != null) { - a(str2, "Giving " + localEntityPlayerMP1.aw + " some " + i2); - int i3 = 1; - if (split.length > 3) { - i3 = b(split[3], 1); - } - if (i3 < 1) { - i3 = 1; - } - if (i3 > 64) { - i3 = 64; - } - localEntityPlayerMP1.b(new ItemStack(i2, i3)); - } else { - localICommandListener.b("There's no item with id " + i2); - } - } catch (NumberFormatException localNumberFormatException) { - localICommandListener.b("There's no item with id " + split[2]); - } - } else { - localICommandListener.b("Can't find user " + (String) localObject2); - } - } else if (str1.toLowerCase().startsWith("say ")) { - str1 = str1.substring(str1.indexOf(" ")).trim(); - a.info("[" + str2 + "] " + str1); - this.f.a(new Packet3Chat("§d[Server] " + str1)); - } else if (str1.toLowerCase().startsWith("tell ")) { - String[] split = str1.split(" "); - if (split.length >= 3) { - str1 = str1.substring(str1.indexOf(" ")).trim(); - str1 = str1.substring(str1.indexOf(" ")).trim(); + if (entityplayermp != null) { + entityplayermp.a.a("Banned by admin"); + } + } else if (s.toLowerCase().startsWith("pardon ")) { + String s7 = s.substring(s.indexOf(" ")).trim(); - a.info("[" + str2 + "->" + split[1] + "] " + str1); - str1 = "§7" + str2 + " whispers " + str1; - a.info(str1); - if (!this.f.a(split[1], new Packet3Chat(str1))) { - localICommandListener.b("There's no player by that name online."); - } - } - } else { - a.info("Unknown console command. Type \"help\" for help."); - } + f.b(s7); + a(s1, (new StringBuilder()).append("Pardoning ").append(s7).toString()); + } else if (s.toLowerCase().startsWith("kick ")) { + String s8 = s.substring(s.indexOf(" ")).trim(); + EntityPlayerMP entityplayermp1 = null; + + for (int i1 = 0; i1 < f.b.size(); i1++) { + EntityPlayerMP entityplayermp5 = (EntityPlayerMP) f.b.get(i1); + + if (entityplayermp5.aw.equalsIgnoreCase(s8)) { + entityplayermp1 = entityplayermp5; } } + + if (entityplayermp1 != null) { + entityplayermp1.a.a("Kicked by admin"); + a(s1, (new StringBuilder()).append("Kicking ").append(entityplayermp1.aw).toString()); + } else { + icommandlistener.b((new StringBuilder()).append("Can't find user ").append(s8).append(". No kick.").toString()); + } + } else if (s.toLowerCase().startsWith("tp ")) { + String as[] = s.split(" "); + + if (as.length == 3) { + EntityPlayerMP entityplayermp2 = f.h(as[1]); + EntityPlayerMP entityplayermp3 = f.h(as[2]); + + if (entityplayermp2 == null) { + icommandlistener.b((new StringBuilder()).append("Can't find user ").append(as[1]).append(". No tp.").toString()); + } else if (entityplayermp3 == null) { + icommandlistener.b((new StringBuilder()).append("Can't find user ").append(as[2]).append(". No tp.").toString()); + } else { + entityplayermp2.a.a(entityplayermp3.p, entityplayermp3.q, entityplayermp3.r, entityplayermp3.v, entityplayermp3.w); + a(s1, (new StringBuilder()).append("Teleporting ").append(as[1]).append(" to ").append(as[2]).append(".").toString()); + } + } else { + icommandlistener.b("Syntax error, please provice a source and a target."); + } + } else if (s.toLowerCase().startsWith("give ")) { + String as1[] = s.split(" "); + + if (as1.length != 3 && as1.length != 4) { + return; + } + String s9 = as1[1]; + EntityPlayerMP entityplayermp4 = f.h(s9); + + if (entityplayermp4 != null) { + try { + int j1 = Integer.parseInt(as1[2]); + + if (Item.c[j1] != null) { + a(s1, (new StringBuilder()).append("Giving ").append(entityplayermp4.aw).append(" some ").append(j1).toString()); + int k1 = 1; + + if (as1.length > 3) { + k1 = b(as1[3], 1); + } + if (k1 < 1) { + k1 = 1; + } + if (k1 > 64) { + k1 = 64; + } + entityplayermp4.b(new ItemStack(j1, k1)); + } else { + icommandlistener.b((new StringBuilder()).append("There's no item with id ").append(j1).toString()); + } + } catch (NumberFormatException numberformatexception) { + icommandlistener.b((new StringBuilder()).append("There's no item with id ").append(as1[2]).toString()); + } + } else { + icommandlistener.b((new StringBuilder()).append("Can't find user ").append(s9).toString()); + } + } else if (s.toLowerCase().startsWith("say ")) { + s = s.substring(s.indexOf(" ")).trim(); + a.info((new StringBuilder()).append("[").append(s1).append("] ").append(s).toString()); + f.a(new Packet3Chat((new StringBuilder()).append("\247d[Server] ").append(s).toString())); + } else if (s.toLowerCase().startsWith("tell ")) { + String as2[] = s.split(" "); + + if (as2.length >= 3) { + s = s.substring(s.indexOf(" ")).trim(); + s = s.substring(s.indexOf(" ")).trim(); + a.info((new StringBuilder()).append("[").append(s1).append("->").append(as2[1]).append("] ").append(s).toString()); + s = (new StringBuilder()).append("\2477").append(s1).append(" whispers ").append(s).toString(); + a.info(s); + if (!f.a(as2[1], new Packet3Chat(s))) { + icommandlistener.b("There's no player by that name online."); + } + } + } else { + a.info("Unknown console command. Type \"help\" for help."); } + } while (true); + } + + private void a(String s, String s1) { + String s2 = (new StringBuilder()).append(s).append(": ").append(s1).toString(); + + f.i((new StringBuilder()).append("\2477(").append(s2).append(")").toString()); + a.info(s2); + } + + private int b(String s, int i1) { + try { + return Integer.parseInt(s); + } catch (NumberFormatException numberformatexception) { + return i1; } } - private void a(String paramString1, String paramString2) { - String str = paramString1 + ": " + paramString2; - this.f.i("§7(" + str + ")"); - a.info(str); + public void a(IUpdatePlayerListBox iupdateplayerlistbox) { + p.add(iupdateplayerlistbox); } - private int b(String paramString, int paramInt) { + public static void main(String args[]) { try { - return Integer.parseInt(paramString); - } catch (NumberFormatException localNumberFormatException) { - } - return paramInt; - } + MinecraftServer minecraftserver = new MinecraftServer(); - public void a(IUpdatePlayerListBox paramIUpdatePlayerListBox) { - this.p.add(paramIUpdatePlayerListBox); - } - - public static void main(String[] paramArrayOfString) { - try { - MinecraftServer localMinecraftServer = new MinecraftServer(); - - if ((!GraphicsEnvironment.isHeadless()) && ((paramArrayOfString.length <= 0) || (!paramArrayOfString[0].equals("nogui")))) { - ServerGUI.a(localMinecraftServer); + if (!java.awt.GraphicsEnvironment.isHeadless() && (args.length <= 0 || !args[0].equals("nogui"))) { + ServerGUI.a(minecraftserver); } - - new ThreadServerApplication("Server thread", localMinecraftServer).start(); - } catch (Exception localException) { - a.log(Level.SEVERE, "Failed to start the minecraft server", localException); + (new ThreadServerApplication("Server thread", minecraftserver)).start(); + } catch (Exception exception) { + a.log(Level.SEVERE, "Failed to start the minecraft server", exception); } } - public File a(String paramString) { - return new File(paramString); + public File a(String s) { + return new File(s); } - public void b(String paramString) { - a.info(paramString); + public void b(String s) { + a.info(s); } public String c() { return "CONSOLE"; } -} + + public static boolean a(MinecraftServer minecraftserver) { + return minecraftserver.o; + } + +} \ No newline at end of file diff --git a/src/net/minecraft/server/ServerConfigurationManager.java b/src/net/minecraft/server/ServerConfigurationManager.java index fcb52322db..37ddc92991 100644 --- a/src/net/minecraft/server/ServerConfigurationManager.java +++ b/src/net/minecraft/server/ServerConfigurationManager.java @@ -1,44 +1,42 @@ package net.minecraft.server; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.io.*; +import java.util.*; import java.util.logging.Logger; + import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerEvent; + public class ServerConfigurationManager { public static Logger a = Logger.getLogger("Minecraft"); - public List b = new ArrayList(); + public List b; private MinecraftServer c; private PlayerManager d; private int e; - private Set f = new HashSet(); - private Set g = new HashSet(); - private Set h = new HashSet(); + private Set f; + private Set g; + private Set h; private File i; private File j; private File k; private PlayerNBTManager l; private CraftServer server; // Craftbukkit - public ServerConfigurationManager(MinecraftServer paramMinecraftServer) { - server = paramMinecraftServer.server; // Craftbukkit + public ServerConfigurationManager(MinecraftServer minecraftserver) { + server = minecraftserver.server; // Craftbukkit - this.c = paramMinecraftServer; - this.i = paramMinecraftServer.a("banned-players.txt"); - this.j = paramMinecraftServer.a("banned-ips.txt"); - this.k = paramMinecraftServer.a("ops.txt"); - this.d = new PlayerManager(paramMinecraftServer); - this.e = paramMinecraftServer.d.a("max-players", 20); + b = new ArrayList(); + f = new HashSet(); + g = new HashSet(); + h = new HashSet(); + c = minecraftserver; + i = minecraftserver.a("banned-players.txt"); + j = minecraftserver.a("banned-ips.txt"); + k = minecraftserver.a("ops.txt"); + d = new PlayerManager(minecraftserver); + e = minecraftserver.d.a("max-players", 20); e(); g(); i(); @@ -47,289 +45,312 @@ public class ServerConfigurationManager { j(); } - public void a(WorldServer paramWorldServer) { - this.l = new PlayerNBTManager(new File(paramWorldServer.t, "players")); + public void a(WorldServer worldserver) { + l = new PlayerNBTManager(new File(worldserver.t, "players")); } public int a() { - return this.d.b(); + return d.b(); } - public void a(EntityPlayerMP paramEntityPlayerMP) { - this.b.add(paramEntityPlayerMP); - this.l.b(paramEntityPlayerMP); - - this.c.e.A.d((int) paramEntityPlayerMP.p >> 4, (int) paramEntityPlayerMP.r >> 4); - - while (this.c.e.a(paramEntityPlayerMP, paramEntityPlayerMP.z).size() != 0) { - paramEntityPlayerMP.a(paramEntityPlayerMP.p, paramEntityPlayerMP.q + 1.0D, paramEntityPlayerMP.r); + public void a(EntityPlayerMP entityplayermp) { + b.add(entityplayermp); + l.b(entityplayermp); + c.e.A.d((int) entityplayermp.p >> 4, (int) entityplayermp.r >> 4); + for (; c.e.a(entityplayermp, entityplayermp.z).size() != 0; entityplayermp.a(entityplayermp.p, entityplayermp.q + 1.0D, entityplayermp.r)) { + ; } - this.c.e.a(paramEntityPlayerMP); - this.d.a(paramEntityPlayerMP); + c.e.a(entityplayermp); + d.a(entityplayermp); // Craftbukkit - server.getPluginManager().callEvent(new PlayerEvent(Type.PLAYER_JOIN, server.getPlayer(paramEntityPlayerMP))); + server.getPluginManager().callEvent(new PlayerEvent(PlayerEvent.Type.PLAYER_JOIN, server.getPlayer(entityplayermp))); } - public void b(EntityPlayerMP paramEntityPlayerMP) { - this.d.c(paramEntityPlayerMP); + public void b(EntityPlayerMP entityplayermp) { + d.c(entityplayermp); } - public void c(EntityPlayerMP paramEntityPlayerMP) { - this.l.a(paramEntityPlayerMP); - this.c.e.d(paramEntityPlayerMP); - this.b.remove(paramEntityPlayerMP); - this.d.b(paramEntityPlayerMP); + public void c(EntityPlayerMP entityplayermp) { + l.a(entityplayermp); + c.e.d(entityplayermp); + b.remove(entityplayermp); + d.b(entityplayermp); // Craftbukkit - server.getPluginManager().callEvent(new PlayerEvent(Type.PLAYER_QUIT, server.getPlayer(paramEntityPlayerMP))); + server.getPluginManager().callEvent(new PlayerEvent(PlayerEvent.Type.PLAYER_QUIT, server.getPlayer(entityplayermp))); } - public EntityPlayerMP a(NetLoginHandler paramNetLoginHandler, String paramString1, String paramString2) { - if (this.f.contains(paramString1.trim().toLowerCase())) { - paramNetLoginHandler.a("You are banned from this server!"); + public EntityPlayerMP a(NetLoginHandler netloginhandler, String s, String s1) { + if (f.contains(s.trim().toLowerCase())) { + netloginhandler.a("You are banned from this server!"); return null; } - String str = paramNetLoginHandler.b.b().toString(); - str = str.substring(str.indexOf("/") + 1); - str = str.substring(0, str.indexOf(":")); - if (this.g.contains(str)) { - paramNetLoginHandler.a("Your IP address is banned from this server!"); + String s2 = netloginhandler.b.b().toString(); + + s2 = s2.substring(s2.indexOf("/") + 1); + s2 = s2.substring(0, s2.indexOf(":")); + if (g.contains(s2)) { + netloginhandler.a("Your IP address is banned from this server!"); return null; } - if (this.b.size() >= this.e) { - paramNetLoginHandler.a("The server is full!"); + if (b.size() >= e) { + netloginhandler.a("The server is full!"); return null; } - for (int m = 0; m < this.b.size(); m++) { - EntityPlayerMP localEntityPlayerMP = (EntityPlayerMP) this.b.get(m); - if (localEntityPlayerMP.aw.equalsIgnoreCase(paramString1)) { - localEntityPlayerMP.a.a("You logged in from another location"); + for (int i1 = 0; i1 < b.size(); i1++) { + EntityPlayerMP entityplayermp = (EntityPlayerMP) b.get(i1); + + if (entityplayermp.aw.equalsIgnoreCase(s)) { + entityplayermp.a.a("You logged in from another location"); } } - return new EntityPlayerMP(this.c, this.c.e, paramString1, new ItemInWorldManager(this.c.e)); + + return new EntityPlayerMP(c, c.e, s, new ItemInWorldManager(c.e)); } - public EntityPlayerMP d(EntityPlayerMP paramEntityPlayerMP) { - this.c.k.a(paramEntityPlayerMP); - this.c.k.b(paramEntityPlayerMP); - this.d.b(paramEntityPlayerMP); - this.b.remove(paramEntityPlayerMP); - this.c.e.e(paramEntityPlayerMP); + public EntityPlayerMP d(EntityPlayerMP entityplayermp) { + c.k.a(entityplayermp); + c.k.b(entityplayermp); + d.b(entityplayermp); + b.remove(entityplayermp); + c.e.e(entityplayermp); + EntityPlayerMP entityplayermp1 = new EntityPlayerMP(c, c.e, entityplayermp.aw, new ItemInWorldManager(c.e)); - EntityPlayerMP localEntityPlayerMP = new EntityPlayerMP(this.c, this.c.e, paramEntityPlayerMP.aw, new ItemInWorldManager(this.c.e)); - localEntityPlayerMP.g = paramEntityPlayerMP.g; - localEntityPlayerMP.a = paramEntityPlayerMP.a; - - this.c.e.A.d((int) localEntityPlayerMP.p >> 4, (int) localEntityPlayerMP.r >> 4); - - while (this.c.e.a(localEntityPlayerMP, localEntityPlayerMP.z).size() != 0) { - localEntityPlayerMP.a(localEntityPlayerMP.p, localEntityPlayerMP.q + 1.0D, localEntityPlayerMP.r); + entityplayermp1.g = entityplayermp.g; + entityplayermp1.a = entityplayermp.a; + c.e.A.d((int) entityplayermp1.p >> 4, (int) entityplayermp1.r >> 4); + for (; c.e.a(entityplayermp1, entityplayermp1.z).size() != 0; entityplayermp1.a(entityplayermp1.p, entityplayermp1.q + 1.0D, entityplayermp1.r)) { + ; } - - localEntityPlayerMP.a.b(new Packet9()); - localEntityPlayerMP.a.a(localEntityPlayerMP.p, localEntityPlayerMP.q, localEntityPlayerMP.r, localEntityPlayerMP.v, localEntityPlayerMP.w); - - this.d.a(localEntityPlayerMP); - this.c.e.a(localEntityPlayerMP); - this.b.add(localEntityPlayerMP); - - localEntityPlayerMP.k(); - return localEntityPlayerMP; + entityplayermp1.a.b(new Packet9()); + entityplayermp1.a.a(entityplayermp1.p, entityplayermp1.q, entityplayermp1.r, entityplayermp1.v, entityplayermp1.w); + d.a(entityplayermp1); + c.e.a(entityplayermp1); + b.add(entityplayermp1); + entityplayermp1.k(); + return entityplayermp1; } public void b() { - this.d.a(); + d.a(); } - public void a(int paramInt1, int paramInt2, int paramInt3) { - this.d.a(paramInt1, paramInt2, paramInt3); + public void a(int i1, int j1, int k1) { + d.a(i1, j1, k1); } - public void a(Packet paramPacket) { - for (int m = 0; m < this.b.size(); m++) { - EntityPlayerMP localEntityPlayerMP = (EntityPlayerMP) this.b.get(m); - localEntityPlayerMP.a.b(paramPacket); + public void a(Packet packet) { + for (int i1 = 0; i1 < b.size(); i1++) { + EntityPlayerMP entityplayermp = (EntityPlayerMP) b.get(i1); + + entityplayermp.a.b(packet); } + } public String c() { - String str = ""; - for (int m = 0; m < this.b.size(); m++) { - if (m > 0) { - str = str + ", "; + String s = ""; + + for (int i1 = 0; i1 < b.size(); i1++) { + if (i1 > 0) { + s = (new StringBuilder()).append(s).append(", ").toString(); } - str = str + ((EntityPlayerMP) this.b.get(m)).aw; + s = (new StringBuilder()).append(s).append(((EntityPlayerMP) b.get(i1)).aw).toString(); } - return str; + + return s; } - public void a(String paramString) { - this.f.add(paramString.toLowerCase()); + public void a(String s) { + f.add(s.toLowerCase()); f(); } - public void b(String paramString) { - this.f.remove(paramString.toLowerCase()); + public void b(String s) { + f.remove(s.toLowerCase()); f(); } private void e() { try { - this.f.clear(); - BufferedReader localBufferedReader = new BufferedReader(new FileReader(this.i)); - String str = ""; - while ((str = localBufferedReader.readLine()) != null) { - this.f.add(str.trim().toLowerCase()); + f.clear(); + BufferedReader bufferedreader = new BufferedReader(new FileReader(i)); + + for (String s = ""; (s = bufferedreader.readLine()) != null;) { + f.add(s.trim().toLowerCase()); } - localBufferedReader.close(); - } catch (Exception localException) { - a.warning("Failed to load ban list: " + localException); + + bufferedreader.close(); + } catch (Exception exception) { + a.warning((new StringBuilder()).append("Failed to load ban list: ").append(exception).toString()); } } private void f() { try { - PrintWriter localPrintWriter = new PrintWriter(new FileWriter(this.i, false)); - for (String str : this.f) { - localPrintWriter.println(str); + PrintWriter printwriter = new PrintWriter(new FileWriter(i, false)); + String s; + + for (Iterator iterator = f.iterator(); iterator.hasNext(); printwriter.println(s)) { + s = (String) iterator.next(); } - localPrintWriter.close(); - } catch (Exception localException) { - a.warning("Failed to save ban list: " + localException); + + printwriter.close(); + } catch (Exception exception) { + a.warning((new StringBuilder()).append("Failed to save ban list: ").append(exception).toString()); } } - public void c(String paramString) { - this.g.add(paramString.toLowerCase()); + public void c(String s) { + g.add(s.toLowerCase()); h(); } - public void d(String paramString) { - this.g.remove(paramString.toLowerCase()); + public void d(String s) { + g.remove(s.toLowerCase()); h(); } private void g() { try { - this.g.clear(); - BufferedReader localBufferedReader = new BufferedReader(new FileReader(this.j)); - String str = ""; - while ((str = localBufferedReader.readLine()) != null) { - this.g.add(str.trim().toLowerCase()); + g.clear(); + BufferedReader bufferedreader = new BufferedReader(new FileReader(j)); + + for (String s = ""; (s = bufferedreader.readLine()) != null;) { + g.add(s.trim().toLowerCase()); } - localBufferedReader.close(); - } catch (Exception localException) { - a.warning("Failed to load ip ban list: " + localException); + + bufferedreader.close(); + } catch (Exception exception) { + a.warning((new StringBuilder()).append("Failed to load ip ban list: ").append(exception).toString()); } } private void h() { try { - PrintWriter localPrintWriter = new PrintWriter(new FileWriter(this.j, false)); - for (String str : this.g) { - localPrintWriter.println(str); + PrintWriter printwriter = new PrintWriter(new FileWriter(j, false)); + String s; + + for (Iterator iterator = g.iterator(); iterator.hasNext(); printwriter.println(s)) { + s = (String) iterator.next(); } - localPrintWriter.close(); - } catch (Exception localException) { - a.warning("Failed to save ip ban list: " + localException); + + printwriter.close(); + } catch (Exception exception) { + a.warning((new StringBuilder()).append("Failed to save ip ban list: ").append(exception).toString()); } } - public void e(String paramString) { - this.h.add(paramString.toLowerCase()); + public void e(String s) { + h.add(s.toLowerCase()); j(); } - public void f(String paramString) { - this.h.remove(paramString.toLowerCase()); + public void f(String s) { + h.remove(s.toLowerCase()); j(); } private void i() { try { - this.h.clear(); - BufferedReader localBufferedReader = new BufferedReader(new FileReader(this.k)); - String str = ""; - while ((str = localBufferedReader.readLine()) != null) { - this.h.add(str.trim().toLowerCase()); + h.clear(); + BufferedReader bufferedreader = new BufferedReader(new FileReader(k)); + + for (String s = ""; (s = bufferedreader.readLine()) != null;) { + h.add(s.trim().toLowerCase()); } - localBufferedReader.close(); - } catch (Exception localException) { - a.warning("Failed to load ip ban list: " + localException); + + bufferedreader.close(); + } catch (Exception exception) { + a.warning((new StringBuilder()).append("Failed to load ip ban list: ").append(exception).toString()); } } private void j() { try { - PrintWriter localPrintWriter = new PrintWriter(new FileWriter(this.k, false)); - for (String str : this.h) { - localPrintWriter.println(str); + PrintWriter printwriter = new PrintWriter(new FileWriter(k, false)); + String s; + + for (Iterator iterator = h.iterator(); iterator.hasNext(); printwriter.println(s)) { + s = (String) iterator.next(); } - localPrintWriter.close(); - } catch (Exception localException) { - a.warning("Failed to save ip ban list: " + localException); + + printwriter.close(); + } catch (Exception exception) { + a.warning((new StringBuilder()).append("Failed to save ip ban list: ").append(exception).toString()); } } - public boolean g(String paramString) { - return this.h.contains(paramString.trim().toLowerCase()); + public boolean g(String s) { + return h.contains(s.trim().toLowerCase()); } - public EntityPlayerMP h(String paramString) { - for (int m = 0; m < this.b.size(); m++) { - EntityPlayerMP localEntityPlayerMP = (EntityPlayerMP) this.b.get(m); - if (localEntityPlayerMP.aw.equalsIgnoreCase(paramString)) { - return localEntityPlayerMP; + public EntityPlayerMP h(String s) { + for (int i1 = 0; i1 < b.size(); i1++) { + EntityPlayerMP entityplayermp = (EntityPlayerMP) b.get(i1); + + if (entityplayermp.aw.equalsIgnoreCase(s)) { + return entityplayermp; } } + return null; } - public void a(String paramString1, String paramString2) { - EntityPlayerMP localEntityPlayerMP = h(paramString1); - if (localEntityPlayerMP != null) { - localEntityPlayerMP.a.b(new Packet3Chat(paramString2)); + public void a(String s, String s1) { + EntityPlayerMP entityplayermp = h(s); + + if (entityplayermp != null) { + entityplayermp.a.b(new Packet3Chat(s1)); } } - public void a(double paramDouble1, double paramDouble2, double paramDouble3, double paramDouble4, Packet paramPacket) { - for (int m = 0; m < this.b.size(); m++) { - EntityPlayerMP localEntityPlayerMP = (EntityPlayerMP) this.b.get(m); - double d1 = paramDouble1 - localEntityPlayerMP.p; - double d2 = paramDouble2 - localEntityPlayerMP.q; - double d3 = paramDouble3 - localEntityPlayerMP.r; - if (d1 * d1 + d2 * d2 + d3 * d3 < paramDouble4 * paramDouble4) { - localEntityPlayerMP.a.b(paramPacket); + public void a(double d1, double d2, double d3, double d4, Packet packet) { + for (int i1 = 0; i1 < b.size(); i1++) { + EntityPlayerMP entityplayermp = (EntityPlayerMP) b.get(i1); + double d5 = d1 - entityplayermp.p; + double d6 = d2 - entityplayermp.q; + double d7 = d3 - entityplayermp.r; + + if (d5 * d5 + d6 * d6 + d7 * d7 < d4 * d4) { + entityplayermp.a.b(packet); } } + } - public void i(String paramString) { - Packet3Chat localPacket3Chat = new Packet3Chat(paramString); - for (int m = 0; m < this.b.size(); m++) { - EntityPlayerMP localEntityPlayerMP = (EntityPlayerMP) this.b.get(m); - if (g(localEntityPlayerMP.aw)) { - localEntityPlayerMP.a.b(localPacket3Chat); + public void i(String s) { + Packet3Chat packet3chat = new Packet3Chat(s); + + for (int i1 = 0; i1 < b.size(); i1++) { + EntityPlayerMP entityplayermp = (EntityPlayerMP) b.get(i1); + + if (g(entityplayermp.aw)) { + entityplayermp.a.b(packet3chat); } } + } - public boolean a(String paramString, Packet paramPacket) { - EntityPlayerMP localEntityPlayerMP = h(paramString); - if (localEntityPlayerMP != null) { - localEntityPlayerMP.a.b(paramPacket); + public boolean a(String s, Packet packet) { + EntityPlayerMP entityplayermp = h(s); + + if (entityplayermp != null) { + entityplayermp.a.b(packet); return true; + } else { + return false; } - return false; } public void d() { - for (int m = 0; m < this.b.size(); m++) { - this.l.a((EntityPlayerMP) this.b.get(m)); + for (int i1 = 0; i1 < b.size(); i1++) { + l.a((EntityPlayerMP) b.get(i1)); } + } - public void a(int paramInt1, int paramInt2, int paramInt3, TileEntity paramTileEntity) { - } + public void a(int i1, int j1, int k1, TileEntity tileentity) {} + }