JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta

This commit is contained in:
NewGarbo 2015-11-27 04:06:02 +00:00
parent dbda29e3f3 ef511f1704
commit 5744178286
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/ClanIcon.java
View File

@ -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;

7
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
View File

@ -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();
}
}