diff --git a/src/main/java/com/comandante/creeper/Items/ItemType.java b/src/main/java/com/comandante/creeper/Items/ItemType.java index 0e863f5267072b97b091a420c679806fab5c897a..a7bc0ff7bf3ebbf2ff1020aa50b1a4b8b38dca31 100755 --- a/src/main/java/com/comandante/creeper/Items/ItemType.java +++ b/src/main/java/com/comandante/creeper/Items/ItemType.java @@ -456,10 +456,10 @@ public enum ItemType { Rarity.BASIC, 6000, Sets.<TimeTracker.TimeOfDay>newHashSet()), - DOGDICKS(41, Arrays.asList("dog", "dick", "dog dick"), - Color.GREEN + "dog" + Color.RESET + " dick" + Color.RESET, - "a " + Color.GREEN + "dog" + Color.RESET + " dick" + Color.RESET + " is here on the ground.", - "a " + Color.GREEN + "dog" + Color.RESET + " dick" + Color.RESET, + DOGNOSES(41, Arrays.asList("dog", "nose", "dog nose"), + Color.GREEN + "dog" + Color.RESET + " nose" + Color.RESET, + "a " + Color.GREEN + "dog" + Color.RESET + " nose" + Color.RESET + " is here on the ground.", + "a " + Color.GREEN + "dog" + Color.RESET + " nose" + Color.RESET, true, 0, 60, diff --git a/src/main/java/com/comandante/creeper/Items/ItemUseRegistry.java b/src/main/java/com/comandante/creeper/Items/ItemUseRegistry.java index 732b1eabbe177271979845bc7e87809f9663a8ea..568fb5a564235729755474d4bbc226cd6a599144 100644 --- a/src/main/java/com/comandante/creeper/Items/ItemUseRegistry.java +++ b/src/main/java/com/comandante/creeper/Items/ItemUseRegistry.java @@ -12,7 +12,6 @@ import com.google.api.client.util.Maps; import com.google.api.client.util.Sets; import org.apache.log4j.Logger; -import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.Set; @@ -41,7 +40,7 @@ public class ItemUseRegistry { addItemUseAction(new DefaultApplyStatsAction(ItemType.MARIJUANA, buildStats(500,500), Sets.<Effect>newHashSet())); //Dog Dick - addItemUseAction(new DefaultApplyStatsAction(ItemType.DOGDICKS, buildStats(500,500), Sets.<Effect>newHashSet())); + addItemUseAction(new DefaultApplyStatsAction(ItemType.DOGNOSES, buildStats(500,500), Sets.<Effect>newHashSet())); //Lemon Haze addItemUseAction(new DefaultApplyStatsAction(ItemType.HAZE, buildStats(1000000,1000000), Sets.<Effect>newHashSet())); diff --git a/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java b/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java index 9666b4f5aec44f60d307fa1a7b32d1ae3f437d61..14d64d9c5d5514c5e6677e57815051de8de0e3b8 100644 --- a/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java +++ b/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java @@ -20,7 +20,7 @@ public class TeleportCommand extends Command { final static List<String> validTriggers = Arrays.asList("teleport", "t"); final static String description = "Teleport to a roomId or playerId."; final static String correctUsage = "teleport <roomId|playerName>"; - final static Set<PlayerRole> roles = Sets.newHashSet(PlayerRole.ADMIN, PlayerRole.TELEPORTER); + final static Set<PlayerRole> roles = Sets.newHashSet(PlayerRole.GOD); final static String teleportMessage = "A " + Color.YELLOW + "lightning" + Color.RESET + " bolt descends from the sky and annihilates the earth below." + "\r\n"; diff --git a/src/main/java/com/comandante/creeper/player/PlayerRole.java b/src/main/java/com/comandante/creeper/player/PlayerRole.java index 16b7cb31e013329710fb42aa20174756cd3982ca..6fdc56dc3c76bcdf8a3a64e4724a6870952155aa 100644 --- a/src/main/java/com/comandante/creeper/player/PlayerRole.java +++ b/src/main/java/com/comandante/creeper/player/PlayerRole.java @@ -4,7 +4,8 @@ public enum PlayerRole { ADMIN("administrator", 1), MORTAL("mortal", 2), - TELEPORTER("teleporter", 3); + TELEPORTER("teleporter", 3), + GOD("god", 3); private final String roleType; private final int roleId;