From 3f1cba4e1ef0dfc6545634c1ae26160047b66e5c Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sun, 17 Nov 2013 23:48:18 -0700 Subject: [PATCH] System message display fixes. Armor penetration fix. Spawn reason fix. --- .../src/me/kaZep/Base/PlayerListener.java | 168 ++++++++++++++---- 1 file changed, 133 insertions(+), 35 deletions(-) diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index 0a80fa4..69c6bc9 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -2160,6 +2160,13 @@ public class PlayerListener return true; } + //Special reasons that should always happen. + if (e.getSpawnReason()==SpawnReason.SPAWNER || e.getSpawnReason()==SpawnReason.BUILD_IRONGOLEM || e.getSpawnReason()==SpawnReason.BREEDING || + e.getSpawnReason()==SpawnReason.BUILD_SNOWMAN || e.getSpawnReason()==SpawnReason.BUILD_WITHER || e.getSpawnReason()==SpawnReason.LIGHTNING || + e.getSpawnReason()==SpawnReason.SPAWNER_EGG || e.getSpawnReason()==SpawnReason.VILLAGE_DEFENSE || e.getSpawnReason()==SpawnReason.VILLAGE_INVASION) { + return true; + } + return false; //If we got down to here, allow this particular mob to spawn. } @@ -6622,11 +6629,19 @@ public ItemStack getGoodie() { } if (this.plugin.inventoryFull(e.getPlayer())) { if (e.getRemaining()==0 && same) { - p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+String.valueOf(mod)+"."); + if (special_convert(e.getItem().getItemStack().getType())) { + p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+convertToItemName(e.getItem().getType().getName(),e.getItem().getItemStack().getData().getData(),e.getItem().getItemStack().getType())+"."); + } else { + p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+String.valueOf(mod)+"."); + } } } else { if (e.getRemaining()==0) { - p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+String.valueOf(mod)+"."); + if (special_convert(e.getItem().getItemStack().getType())) { + p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+convertToItemName(e.getItem().getType().getName(),e.getItem().getItemStack().getData().getData(),e.getItem().getItemStack().getType())+"."); + } else { + p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+String.valueOf(mod)+"."); + } } } } @@ -7611,20 +7626,6 @@ public ItemStack getGoodie() { } } final Player p = (Player) e.getDamager(); - if (f.getNoDamageTicks()0) { - f.setHealth(Warning(f,13)); + f.setHealth(f.getHealth()-(normaldmg+armor_pen)); + armor_pen_dmg=(normaldmg+armor_pen); if (f!=null) { if (this.plugin.getAccountsConfig().getBoolean(p.getName()+".settings.notify4")) { if (f.getCustomName()!=null) { @@ -7795,26 +7797,27 @@ public ItemStack getGoodie() { } } } + if (f.getNoDamageTicks()0) { - f.setHealth(Warning(f.getHealth()-(normaldmg+armor_pen),17)); + f.setHealth(f.getHealth()-(normaldmg+armor_pen)); + armor_pen_dmg=(normaldmg+armor_pen); if (this.plugin.getAccountsConfig().getBoolean(p.getName()+".settings.notify4")) { if (f.getCustomName()!=null) { //p.sendMessage(ChatColor.RED+""+ChatColor.ITALIC+" Dealt "+(Math.round(normaldmg+armor_pen)*10)/10+" damage to "+convertToItemName(f.getCustomName())+"."); @@ -7992,6 +7996,21 @@ public ItemStack getGoodie() { } } } + if (f.getNoDamageTicks() 0) { //Bukkit.getPlayer("AaMay").sendMessage(newItemsCount+" New Items have been detected."); if (plugin.getAccountsConfig().getBoolean(player.getName()+".settings.notify2")) { - Bukkit.getPlayer(player.getName()).sendMessage(ChatColor.DARK_AQUA+""+ChatColor.ITALIC+"Crafted "+newItemsCount+" "+convertToItemName(compareItem.getType().name())+"."); + if (special_convert(compareItem.getType())) { + Bukkit.getPlayer(player.getName()).sendMessage(ChatColor.DARK_AQUA+""+ChatColor.ITALIC+"Crafted "+newItemsCount+" "+convertToItemName(compareItem.getType().name(), compareItem.getData().getData(), compareItem.getType())+"."); + } else { + Bukkit.getPlayer(player.getName()).sendMessage(ChatColor.DARK_AQUA+""+ChatColor.ITALIC+"Crafted "+newItemsCount+" "+convertToItemName(compareItem.getType().name())+"."); + } } rewardCraft(compareItem,newItemsCount,player); } @@ -12181,6 +12204,14 @@ public void onEntityExpode(ExplosionPrimeEvent e) { else; } +public boolean special_convert(Material mat) { + if (mat==Material.WOOL || mat==Material.INK_SACK || mat==Material.CARPET) { + return true; + } else { + return false; + } +} + public String convertToItemName(String val) { val=val.replace('_', ' '); char[] mod = val.toCharArray(); @@ -12211,6 +12242,73 @@ public String convertToItemName(String val) { return String.valueOf(mod); } +public String convertToItemName(String val, short data, Material material_id) { + String color = ""; + String name = ""; + switch (material_id) { + case WOOL:{ + name = "Wool"; + }break; + case INK_SACK:{ + name = "Dye"; + }break; + case CARPET:{ + name = "Carpet"; + }break; + } + switch (data) { + case 0:{ + color = "White"; + }break; + case 1:{ + color = "Orange"; + }break; + case 2:{ + color = "Magenta"; + }break; + case 3:{ + color = "Light Blue"; + }break; + case 4:{ + color = "Yellow"; + }break; + case 5:{ + color = "Lime"; + }break; + case 6:{ + color = "Pink"; + }break; + case 7:{ + color = "Gray"; + }break; + case 8:{ + color = "Light Gray"; + }break; + case 9:{ + color = "Cyan"; + }break; + case 10:{ + color = "Purple"; + }break; + case 11:{ + color = "Blue"; + }break; + case 12:{ + color = "Brown"; + }break; + case 13:{ + color = "Green"; + }break; + case 14:{ + color = "Red"; + }break; + case 15:{ + color = "Black"; + }break; + } + return String.valueOf(color+" "+name); +} + @EventHandler public void onHangingBreak(HangingBreakEvent e) { //Bukkit.broadcastMessage(""+e.getCause());