diff --git a/Changelog.txt b/Changelog.txt index 55f25675f..e9ceb3027 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Changelog: #Versions without changelogs probably had very small misc fixes, like tweaks to the source code + Version 1.3.00-dev - Fixed /mcability not respecting permissions - Changed to use Bukkit's built-in ignoreCancelledEvents system @@ -7,6 +8,8 @@ Version 1.3.00-dev - Added configuration option to control mcMMO reporting damage events - Added hunger regain bonuses to Herbalism skill - Changed chat logging for /p & /a + - Fixed Tree Feller not playing nice with NoCheat + - Added framework for new Blast Mining skill Version 1.2.12 - Fixed issue that caused terrible MySQL performance and negative XP on levelup (Issue #134) @@ -19,7 +22,6 @@ Version 1.2.12 - Fixed config.yml not having values for End Stone & other new mining blocks - Fixed Green Thumb/Green Terra not correctly planting wheat (Issue #133) - Version 1.2.11 - Removed legacy Permission & PEX dependency. (PEX still works fine with mcMMO) - Made Smooth Brick to Mossy Brick and Dirt to Grass for green thumb configurable (Issue #120) diff --git a/pom.xml b/pom.xml index 73ff5ba01..531bbf372 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ com.gmail.nossr50.mcMMO mcMMO mcMMO - https://github.com/TheYeti/mcMMO + https://github.com/mcMMO-Dev/mcMMO - GitHub - https://github.com/TheYeti/mcMMO/issues + http://issues.mcmmo.org + JIRA mcMMO @@ -121,5 +121,5 @@ UTF-8 - 2.0.00-dev + 1.3.00-dev diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java index e3805ede1..09126ee70 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java @@ -93,11 +93,11 @@ public class mcBlockListener implements Listener if (id == 17 || id == 73 || id == 74 || id == 81 || id == 83 || id == 86 || id == 91 || id == 106 || id == 98) plugin.misc.blockWatchList.add(block); else { - //block.setData((byte) 5); //Change the byte + block.setData((byte) 5); //Change the byte //The following is a method to get around a breakage in 1.1-R2 and onward //it should be removed as soon as functionality to change a block //in this event returns. - plugin.changeQueue.push(block); +// plugin.changeQueue.push(block); } } @@ -151,10 +151,10 @@ public class mcBlockListener implements Listener */ //TNT removal checks - needed for Blast Mining - if(block.getTypeId() == 46) - { - plugin.misc.tntTracker.remove(block); - } +// if(block.getTypeId() == 46 && inhand != ) +// { +// plugin.misc.tntTracker.remove(block); +// } //Green Terra if(PP.getHoePreparationMode() && mcPermissions.getInstance().herbalismAbility(player) && block.getTypeId() == 59 && block.getData() == (byte) 0x07) @@ -216,6 +216,9 @@ public class mcBlockListener implements Listener if(LoadProperties.spoutEnabled) SpoutStuff.playSoundForPlayer(SoundEffect.EXPLODE, player, block.getLocation()); + PlayerAnimationEvent armswing = new PlayerAnimationEvent(player); + Bukkit.getPluginManager().callEvent(armswing); + WoodCutting.treeFeller(block, player, plugin); for(Block blockx : plugin.misc.treeFeller) { @@ -283,8 +286,6 @@ public class mcBlockListener implements Listener plugin.misc.blockWatchList.remove(block); } } - - //System.out.println("DEBUG: "+event.isCancelled()+", BLOCK_TYPE: "+event.getBlock().getType().toString()+", BLOCK_DATA: "+event.getBlock().getData()); } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @@ -416,5 +417,5 @@ public class mcBlockListener implements Listener { blockTo.setData((byte)5); } - } -} \ No newline at end of file + } +} diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java index 66c2e31e8..34c869f21 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java @@ -240,7 +240,7 @@ public class mcEntityListener implements Listener } } - @EventHandler (priority = EventPriority.MONITOR) + @EventHandler (priority = EventPriority.LOW) public void onFoodLevelChange(FoodLevelChangeEvent event) { if(event.getEntity() instanceof Player)