nossr50 4 年之前
父节点
当前提交
480f9afa80

+ 3 - 0
Changelog.txt

@@ -6,11 +6,14 @@ Version 2.1.144
     Lowered the XP ceiling of Roll
     Fixed a NPE that would happen involving taming in combat processing
     Updated hu_HU locale (thanks andris155)
+    Fixed a bug where mcMMO could erase item data on Wheat Seeds when using Green Thumb on a block
+    Changed one of the PlayerInteractEvent listeners to ignore cancelled events (should improve plugin compatibility)
     mmodebug mode now prints some information when fuel efficiency is applied to a furnace
 
     NOTES:
     I seem to consistently find old bugs in mcMMO, this deflect bug where it was checked twice, who knows how many years its been in mcMMO, I didn't check but its probably between 5-7.
     I was waiting to make Steel Arm Customizable for the config update (due in the future), but enough people ask for it that I decided to do the extra work to put it into 2.1.XX
+    Tridents & Crossbows is likely going to be in development continuing into September, I am taking my time to make it feature packed and I hope you guys will appreciate it.
 
 Version 2.1.143
     mcMMO now tracks super ability boosted items through persistent metadata

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.144-SNAPSHOT</version>
+    <version>2.1.144</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

+ 1 - 1
src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -367,7 +367,7 @@ public class EntityListener implements Listener {
             Player defendingPlayer = (Player) defender;
             Player attackingPlayer;
 
-            //If the attacker is a Player or a projectile beloning to a player
+            //If the attacker is a Player or a projectile belonging to a player
             if(attacker instanceof Projectile || attacker instanceof Player) {
                 if(attacker instanceof Projectile) {
                     Projectile projectile = (Projectile) attacker;

+ 3 - 2
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -711,7 +711,7 @@ public class PlayerListener implements Listener {
      *
      * @param event The event to monitor
      */
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerInteractMonitor(PlayerInteractEvent event) {
         /* WORLD BLACKLIST CHECK */
         if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
@@ -804,7 +804,8 @@ public class PlayerListener implements Listener {
                 FakePlayerAnimationEvent fakeSwing = new FakePlayerAnimationEvent(event.getPlayer()); //PlayerAnimationEvent compat        
                 if (herbalismManager.canGreenThumbBlock(blockState)) {
                     Bukkit.getPluginManager().callEvent(fakeSwing);
-                    player.getInventory().setItemInMainHand(new ItemStack(Material.WHEAT_SEEDS, heldItem.getAmount() - 1));
+                    player.getInventory().getItemInMainHand().setAmount(heldItem.getAmount() - 1);
+                    player.updateInventory();
                     if (herbalismManager.processGreenThumbBlocks(blockState) && EventUtils.simulateBlockBreak(block, player, false)) {
                         blockState.update(true);
                     }