From 6da10950da4a6954b2899dbee8a7a703851fbd42 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 26 Nov 2015 22:37:54 -0500 Subject: [PATCH] Update clan icons, fix client class --- .../src/mineplex/game/clans/clans/gui/ClanIcon.java | 5 +++-- .../minecraft/game/classcombat/Class/ClientClass.java | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java index 095f4dddd..078b469f7 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java @@ -10,8 +10,9 @@ public enum ClanIcon MEMBER(Material.SAND, (byte) 1), COMMANDS(Material.RED_SANDSTONE, (byte) 0), ENERGY(Material.SEA_LANTERN, (byte) 0), - WAR(Material.CARPET, (byte) 1), - ALLIANCE(Material.CARPET, (byte) 6); + CASTLE(Material.RECORD_9, (byte) 0), + WAR(Material.RECORD_11, (byte) 0), + ALLIANCE(Material.RECORD_10, (byte) 0); private Material _material; private byte _data; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java index 795407387..f1c81cb0a 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java @@ -141,6 +141,9 @@ public class ClientClass { if (slotToken == null) continue; + + if (slotToken.Name == null) + continue; if (slotToken.Material == null) continue; @@ -148,9 +151,9 @@ public class ClientClass if (slotToken.Material.isEmpty()) continue; - if (_itemFactory.GetItem(slotToken.Name.equalsIgnoreCase("Cobweb") ? "Web" : slotToken.Name) != null) + if (_itemFactory.GetItem("Cobweb".equalsIgnoreCase(slotToken.Name) ? "Web" : slotToken.Name) != null) { - itemTokenUsage += _itemFactory.GetItem(slotToken.Name.equalsIgnoreCase("Cobweb") ? "Web" : slotToken.Name).getTokenCost(); + itemTokenUsage += _itemFactory.GetItem("Cobweb".equalsIgnoreCase(slotToken.Name) ? "Web" : slotToken.Name).getTokenCost(); } }