From ace14e83d12c4ada1e2ef9d38501971852c867aa Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 21 Jul 2011 06:35:49 -0700 Subject: [PATCH] Version 1.0.41 --- mcMMO/Changelog.txt | 5 +++ mcMMO/com/gmail/nossr50/Combat.java | 21 ++---------- .../nossr50/listeners/mcBlockListener.java | 12 +++---- mcMMO/com/gmail/nossr50/mcMMO.java | 3 +- .../com/gmail/nossr50/skills/Excavation.java | 4 ++- mcMMO/com/gmail/nossr50/skills/Mining.java | 33 ++++++++++--------- mcMMO/plugin.yml | 2 +- 7 files changed, 38 insertions(+), 42 deletions(-) diff --git a/mcMMO/Changelog.txt b/mcMMO/Changelog.txt index 9509d0e7d..4d402aaff 100644 --- a/mcMMO/Changelog.txt +++ b/mcMMO/Changelog.txt @@ -1,5 +1,10 @@ Changelog: #Versions without changelogs probably had very small misc fixes, like tweaks to the source code +Version 1.0.41 +Fixed errors using Tree Feller if your server wasn't running BukkitContrib (sorry!) +Fixed some more leftover stuff involving the new half-finished mining skill +Fixed excavation's Giga Drill Breaker not working on placed blocks + Version 1.0.40 Fixed errors if your server wasn't running BukkitContrib diff --git a/mcMMO/com/gmail/nossr50/Combat.java b/mcMMO/com/gmail/nossr50/Combat.java index bd300fa75..9d89ec3b6 100644 --- a/mcMMO/com/gmail/nossr50/Combat.java +++ b/mcMMO/com/gmail/nossr50/Combat.java @@ -114,23 +114,7 @@ public class Combat xp = (event.getDamage() * 3) * LoadProperties.xpGainMultiplier; if(event.getEntity() instanceof Ghast) xp = (event.getDamage() * 3) * LoadProperties.xpGainMultiplier; - - if(pluginx.mob.mobDiff.containsKey(event.getEntity().getEntityId())) - { - pluginx.mob.isAggressive.put(event.getEntity().getEntityId(), true); - //ARMOR REDUCTION BASED ON ENEMY RANKING - int modifiedDmg = event.getDamage() / (pluginx.mob.mobDiff.get(event.getEntity().getEntityId())+1); - if(modifiedDmg < 1) - modifiedDmg = 1; - event.setDamage(modifiedDmg); - } - - //ADJUST TO DIFFICULTY - if(pluginx.mob.mobDiff.containsKey(event.getEntity().getEntityId())) - { - xp = xp * (pluginx.mob.mobDiff.get(event.getEntity().getEntityId())+1); - } - + if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker)) PPa.addXP(SkillType.SWORDS, xp); else if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)) @@ -348,7 +332,8 @@ public class Combat /* * Defender is Monster */ - if(x instanceof Monster){ + if(!pluginx.misc.mobSpawnerList.contains(x) && x instanceof Monster) + { //XP if(x instanceof Creeper) PPa.addXP(SkillType.ARCHERY, (event.getDamage() * 4) * LoadProperties.xpGainMultiplier); diff --git a/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java b/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java index e4a1ca3f7..38bb14051 100644 --- a/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java @@ -230,8 +230,8 @@ public class mcBlockListener extends BlockListener { /* * EXCAVATION */ - if(mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 5) - Excavation.excavationProcCheck(block.getTypeId(), block.getLocation(), player); + if(mcPermissions.getInstance().excavation(player)) + Excavation.excavationProcCheck(block.getData(), block.getTypeId(), block.getLocation(), player); /* * HERBALISM */ @@ -314,7 +314,7 @@ public class mcBlockListener extends BlockListener { /* * TREE FELLAN STUFF */ - if(block.getTypeId() == 17 && Users.getProfile(player).getTreeFellerMode()) + if(LoadProperties.contribEnabled && block.getTypeId() == 17 && Users.getProfile(player).getTreeFellerMode()) contribStuff.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation()); /* @@ -328,14 +328,14 @@ public class mcBlockListener extends BlockListener { * GIGA DRILL BREAKER CHECKS */ if(PP.getGigaDrillBreakerMode() && m.blockBreakSimulate(block, player, plugin) - && Excavation.canBeGigaDrillBroken(block) && m.isShovel(inhand) - && block.getData() != (byte) 5){ + && Excavation.canBeGigaDrillBroken(block) && m.isShovel(inhand)) + { int x = 1; while(x < 4) { - Excavation.excavationProcCheck(block.getTypeId(), block.getLocation(), player); + Excavation.excavationProcCheck(block.getData(), block.getTypeId(), block.getLocation(), player); x++; } diff --git a/mcMMO/com/gmail/nossr50/mcMMO.java b/mcMMO/com/gmail/nossr50/mcMMO.java index 801e3de16..7fc1834c3 100644 --- a/mcMMO/com/gmail/nossr50/mcMMO.java +++ b/mcMMO/com/gmail/nossr50/mcMMO.java @@ -645,7 +645,8 @@ public class mcMMO extends JavaPlugin player.sendMessage(ChatColor.GREEN+"If you like my work you can donate via Paypal: nossr50@gmail.com"); } } - else if(LoadProperties.mccEnable && label.equalsIgnoreCase(LoadProperties.mcc)){ + else if(LoadProperties.mccEnable && label.equalsIgnoreCase(LoadProperties.mcc)) + { player.sendMessage(ChatColor.RED+"---[]"+ChatColor.YELLOW+"mcMMO Commands"+ChatColor.RED+"[]---"); if(mcPermissions.getInstance().party(player)){ player.sendMessage(mcLocale.getString("m.mccPartyCommands")); diff --git a/mcMMO/com/gmail/nossr50/skills/Excavation.java b/mcMMO/com/gmail/nossr50/skills/Excavation.java index 01b086006..ac8827813 100644 --- a/mcMMO/com/gmail/nossr50/skills/Excavation.java +++ b/mcMMO/com/gmail/nossr50/skills/Excavation.java @@ -63,11 +63,13 @@ public class Excavation return false; } } - public static void excavationProcCheck(int type, Location loc, Player player) + public static void excavationProcCheck(byte data, int type, Location loc, Player player) { PlayerProfile PP = Users.getProfile(player); ItemStack is = null; Material mat = null; + if(data != (byte) 5) + return; if(type == 2) { diff --git a/mcMMO/com/gmail/nossr50/skills/Mining.java b/mcMMO/com/gmail/nossr50/skills/Mining.java index a5ed233d7..9f24aeab8 100644 --- a/mcMMO/com/gmail/nossr50/skills/Mining.java +++ b/mcMMO/com/gmail/nossr50/skills/Mining.java @@ -169,19 +169,21 @@ public class Mining { loc.getWorld().dropItemNaturally(loc, item); } } - public static void blockProcCheck(Block block, Player player) + /* + public static void blockProcSmeltCheck(Block block, Player player) { PlayerProfile PP = Users.getProfile(player); if(player != null) { if(Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING)) { - blockProcSimulate(block); + blockProcSmeltSimulate(block); return; } - } + } } - public static void blockProcSmeltCheck(Block block, Player player) + */ + public static void blockProcCheck(Block block, Player player) { PlayerProfile PP = Users.getProfile(player); if(player != null) @@ -199,12 +201,13 @@ public class Mining { if(plugin.misc.blockWatchList.contains(block) || block.getData() == (byte) 5) return; int xp = 0; - if(block.getTypeId() == 1 || block.getTypeId() == 24){ + if(block.getTypeId() == 1 || block.getTypeId() == 24) + { xp += LoadProperties.mstone; if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //OBSIDIAN if(block.getTypeId() == 49) @@ -213,7 +216,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //NETHERRACK if(block.getTypeId() == 87) @@ -222,7 +225,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //GLOWSTONE if(block.getTypeId() == 89) @@ -231,7 +234,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //COAL if(block.getTypeId() == 16) @@ -240,7 +243,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //GOLD if(block.getTypeId() == 14) @@ -249,7 +252,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //DIAMOND if(block.getTypeId() == 56){ @@ -257,7 +260,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //IRON if(block.getTypeId() == 15) @@ -266,7 +269,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //REDSTONE if(block.getTypeId() == 73 || block.getTypeId() == 74) @@ -275,7 +278,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } //LAPUS if(block.getTypeId() == 21) @@ -284,7 +287,7 @@ public class Mining { if(smelt = false) blockProcCheck(block, player); else - blockProcSmeltCheck(block, player); + blockProcCheck(block, player); } PP.addXP(SkillType.MINING, xp * LoadProperties.xpGainMultiplier); Skills.XpCheckSkill(SkillType.MINING, player); diff --git a/mcMMO/plugin.yml b/mcMMO/plugin.yml index b468ed35a..9bece8a2a 100644 --- a/mcMMO/plugin.yml +++ b/mcMMO/plugin.yml @@ -1,6 +1,6 @@ name: mcMMO main: com.gmail.nossr50.mcMMO -version: 1.0.40 +version: 1.0.41 commands: mcc: description: Lists mcMMO commands