diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/Material.java | 13 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/Player.java | 8 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java index 3d0d6806..ae08dcbf 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -183,7 +183,8 @@ public enum Material { GreenRecord(2257); private final int id; - private static final Map<Integer, Material> lookup = new HashMap<Integer, Material>(); + private static final Map<Integer, Material> lookupId = new HashMap<Integer, Material>(); + private static final Map<String, Material> lookupName = new HashMap<String, Material>(); private Material(final int id) { this.id = id; @@ -198,12 +199,18 @@ public enum Material { } public static Material getMaterial(final int id) { - return lookup.get(id); + return lookupId.get(id); + } + + public static Material getMaterial(final String name) { + return lookupName.get(name); } static { for (Material material : values()) { - lookup.put(material.getID(), material); + lookupId.put(material.getID(), material); + lookupName.put(material.name(), material); } } + } diff --git a/src/main/java/org/bukkit/Player.java b/src/main/java/org/bukkit/Player.java index ffa03eb8..3d3f4d3a 100644 --- a/src/main/java/org/bukkit/Player.java +++ b/src/main/java/org/bukkit/Player.java @@ -1,6 +1,8 @@ package org.bukkit; +import java.net.InetSocketAddress; + /** * Represents a player, connected or not * @@ -39,4 +41,10 @@ public interface Player extends HumanEntity { * @return String containing a color formatted name to display for this player */ public void setDisplayName(String name); + + /** + * Gets the socket address of this player + * @return the player's address + */ + public InetSocketAddress getAddress(); } |