Commits
Lymia authored 32224b916dd
| 1 1 | package net.minecraft.server; |
| 2 2 | |
| 3 3 | |
| 4 4 | import java.io.File; |
| 5 - | import java.io.IOException; |
| 6 - | import java.io.PrintStream; |
| 7 5 | import java.net.InetAddress; |
| 8 6 | import java.net.UnknownHostException; |
| 9 7 | import java.util.ArrayList; |
| 10 8 | import java.util.Collections; |
| 11 9 | import java.util.HashMap; |
| 12 10 | import java.util.Iterator; |
| 13 11 | import java.util.List; |
| 14 - | import java.util.Set; |
| 15 12 | import java.util.logging.Level; |
| 16 13 | import java.util.logging.Logger; |
| 17 14 | |
| 18 15 | import org.bukkit.craftbukkit.CraftServer; |
| 19 16 | |
| 20 17 | |
| 21 18 | public class MinecraftServer |
| 22 19 | implements ICommandListener, Runnable { |
| 23 20 | |
| 24 21 | public static Logger a = Logger.getLogger("Minecraft"); |
| 25 - | public static HashMap b = new HashMap(); |
| 22 + | public static HashMap<String, Integer> b = new HashMap<String, Integer>(); |
| 26 23 | public NetworkListenThread c; |
| 27 24 | public PropertyManager d; |
| 28 25 | public WorldServer e; |
| 29 26 | public ServerConfigurationManager f; |
| 30 27 | private boolean o; |
| 31 28 | public boolean g; |
| 32 29 | int h; |
| 33 30 | public String i; |
| 34 31 | public int j; |
| 35 - | private List p; |
| 36 - | private List q; |
| 32 + | private List<IUpdatePlayerListBox> p; |
| 33 + | private List<ServerCommand> q; |
| 37 34 | public EntityTracker k; |
| 38 35 | public boolean l; |
| 39 36 | public boolean m; |
| 40 37 | public boolean n; |
| 41 38 | |
| 42 39 | public CraftServer server; // CraftBukkit |
| 43 40 | |
| 44 41 | public MinecraftServer() { |
| 45 42 | o = true; |
| 46 43 | g = false; |
| 47 44 | h = 0; |
| 48 - | p = new ArrayList(); |
| 49 - | q = Collections.synchronizedList(new ArrayList()); |
| 45 + | p = new ArrayList<IUpdatePlayerListBox>(); |
| 46 + | q = Collections.synchronizedList(new ArrayList<ServerCommand>()); |
| 50 47 | new ThreadSleepForever(this); |
| 51 48 | } |
| 52 49 | |
| 53 50 | // CraftBukkit: added throws UnknownHostException |
| 54 51 | private boolean d() throws UnknownHostException { |
| 55 52 | ThreadCommandReader threadcommandreader = new ThreadCommandReader(this); |
| 56 53 | |
| 57 54 | threadcommandreader.setDaemon(true); |
| 58 55 | threadcommandreader.start(); |
| 59 56 | ConsoleLogManager.a(); |
| 205 202 | } |
| 206 203 | } |
| 207 204 | } finally { |
| 208 205 | g(); |
| 209 206 | g = true; |
| 210 207 | System.exit(0); |
| 211 208 | } |
| 212 209 | } |
| 213 210 | |
| 214 211 | private void h() { |
| 215 - | ArrayList arraylist = new ArrayList(); |
| 212 + | ArrayList<String> arraylist = new ArrayList<String>(); |
| 216 213 | |
| 217 - | for (Iterator iterator = b.keySet().iterator(); iterator.hasNext();) { |
| 214 + | for (Iterator<String> iterator = b.keySet().iterator(); iterator.hasNext();) { |
| 218 215 | String s = (String) iterator.next(); |
| 219 216 | int k1 = ((Integer) b.get(s)).intValue(); |
| 220 217 | |
| 221 218 | if (k1 > 0) { |
| 222 219 | b.put(s, Integer.valueOf(k1 - 1)); |
| 223 220 | } else { |
| 224 221 | arraylist.add(s); |
| 225 222 | } |
| 226 223 | } |
| 227 224 | |