fix mcMMO spawning bonus drops into other blocks

nossr50 · nossr50 · commit 072f90054961 · 2025-03-17T14:42:20.000-07:00
fixes #5149
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,4 +1,5 @@
 Version 2.2.034
+    Fixed bug where mcMMO would drop items in such a way that they get stuck in an adjacent block and float to the surface
     Fixed a rare edge case where null entities during chunk unload would cause a NullPointerException and potentially lead to server instability
     Fixed bug where arrow would award archery xp after a crossbow trickshot bounce
 
diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -39,6 +39,8 @@
 
 import java.util.HashSet;
 
+import static com.gmail.nossr50.util.Misc.getBlockCenter;
+
 public class BlockListener implements Listener {
     private final mcMMO plugin;
 
@@ -103,11 +105,15 @@ public void onBlockDropItemEvent(BlockDropItemEvent event) {
                 }
 
                 if (event.getBlock().getMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS).size() > 0) {
-                    BonusDropMeta bonusDropMeta = (BonusDropMeta) event.getBlock().getMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS).get(0);
+                    final BonusDropMeta bonusDropMeta =
+                            (BonusDropMeta) event.getBlock().getMetadata(
+                                    MetadataConstants.METADATA_KEY_BONUS_DROPS).get(0);
                     int bonusCount = bonusDropMeta.asInt();
-
+                    final Location centeredLocation = getBlockCenter(event.getBlock());
                     for (int i = 0; i < bonusCount; i++) {
-                        ItemUtils.spawnItemNaturally(event.getPlayer(), event.getBlockState().getLocation(), is, ItemSpawnReason.BONUS_DROPS);
+
+                        ItemUtils.spawnItemNaturally(event.getPlayer(),
+                                centeredLocation, is, ItemSpawnReason.BONUS_DROPS);
                     }
                 }
             }
diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java
@@ -50,13 +50,13 @@ public void excavationBlockCheck(Block block) {
 
             if (!treasures.isEmpty()) {
                 int skillLevel = getSkillLevel();
-                Location location = Misc.getBlockCenter(block);
+                final Location centerOfBlock = Misc.getBlockCenter(block);
 
                 for (ExcavationTreasure treasure : treasures) {
                     if (skillLevel >= treasure.getDropLevel()
                             && ProbabilityUtil.isStaticSkillRNGSuccessful(
                             PrimarySkillType.EXCAVATION, mmoPlayer, treasure.getDropProbability())) {
-                        processExcavationBonusesOnBlock(treasure, location);
+                        processExcavationBonusesOnBlock(treasure, centerOfBlock);
                     }
                 }
             }
diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
@@ -43,6 +43,7 @@
 
 import static com.gmail.nossr50.util.ItemUtils.hasItemIncludingOffHand;
 import static com.gmail.nossr50.util.ItemUtils.removeItemIncludingOffHand;
+import static com.gmail.nossr50.util.Misc.getBlockCenter;
 import static com.gmail.nossr50.util.text.ConfigStringUtils.getMaterialConfigString;
 import static java.util.Objects.requireNonNull;
 
@@ -733,7 +734,7 @@ public boolean processHylianLuck(BlockState blockState) {
             return false;
         }
         int skillLevel = getSkillLevel();
-        Location location = Misc.getBlockCenter(blockState);
+        final Location centerOfBlock = getBlockCenter(blockState);
 
         for (HylianTreasure treasure : treasures) {
             if (skillLevel >= treasure.getDropLevel()
@@ -742,7 +743,7 @@ public boolean processHylianLuck(BlockState blockState) {
                     return false;
                 }
                 blockState.setType(Material.AIR);
-                ItemUtils.spawnItem(getPlayer(), location, treasure.getDrop(), ItemSpawnReason.HYLIAN_LUCK_TREASURE);
+                ItemUtils.spawnItem(getPlayer(), centerOfBlock, treasure.getDrop(), ItemSpawnReason.HYLIAN_LUCK_TREASURE);
                 NotificationManager.sendPlayerInformation(mmoPlayer.getPlayer(), NotificationType.SUBSKILL_MESSAGE, "Herbalism.HylianLuck");
                 return true;
             }
diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
@@ -31,6 +31,7 @@
 import java.util.*;
 
 import static com.gmail.nossr50.util.ItemUtils.isPickaxe;
+import static com.gmail.nossr50.util.Misc.getBlockCenter;
 
 public class MiningManager extends SkillManager {
 
@@ -214,7 +215,7 @@ public void blastMiningDropProcessing(float yield, EntityExplodeEvent event) {
 
             if (block.getType().isItem() && Probability.ofPercent(10).evaluate()) {
                 ItemUtils.spawnItem(getPlayer(),
-                        Misc.getBlockCenter(block),
+                        getBlockCenter(block),
                         new ItemStack(block.getType()),
                         ItemSpawnReason.BLAST_MINING_DEBRIS_NON_ORES); // Initial block that would have been dropped
             }
@@ -234,14 +235,14 @@ public void blastMiningDropProcessing(float yield, EntityExplodeEvent event) {
                     Collection<ItemStack> oreDrops = isPickaxe(mmoPlayer.getPlayer().getInventory().getItemInMainHand())
                             ? block.getDrops(mmoPlayer.getPlayer().getInventory().getItemInMainHand())
                             : List.of(new ItemStack(block.getType()));
-                    ItemUtils.spawnItems(getPlayer(), Misc.getBlockCenter(block),
+                    ItemUtils.spawnItems(getPlayer(), getBlockCenter(block),
                             oreDrops, BLAST_MINING_BLACKLIST, ItemSpawnReason.BLAST_MINING_ORES);
 
                     if (mcMMO.p.getAdvancedConfig().isBlastMiningBonusDropsEnabled()) {
                         if (Probability.ofValue(0.5F).evaluate()) {
                             for (int i = 1; i < dropMultiplier; i++) {
-                                ItemUtils.spawnItems(getPlayer(),
-                                        Misc.getBlockCenter(block),
+                                ItemUtils.pawnItems(getPlayer(),
+                                        getBlockCenter(block),
                                         oreDrops,
                                         BLAST_MINING_BLACKLIST,
                                         ItemSpawnReason.BLAST_MINING_ORES_BONUS_DROP);
diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
@@ -109,7 +109,8 @@ public void disarmCheck(@NotNull Player defender) {
             if (UserManager.getPlayer(defender) == null)
                 return;
 
-            Item item = ItemUtils.spawnItem(getPlayer(), defender.getLocation(), defender.getInventory().getItemInMainHand(), ItemSpawnReason.UNARMED_DISARMED_ITEM);
+            final Item item = ItemUtils.spawnItem(getPlayer(), defender.getLocation(),
+                    defender.getInventory().getItemInMainHand(), ItemSpawnReason.UNARMED_DISARMED_ITEM);
 
             if (item != null && mcMMO.p.getAdvancedConfig().getDisarmProtected()) {
                 item.setMetadata(MetadataConstants.METADATA_KEY_DISARMED_ITEM, UserManager.getPlayer(defender).getPlayerMetadata());
diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java
@@ -759,7 +759,7 @@ public static void spawnItems(@Nullable Player player,
         }
 
         // We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event.
-        McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);
+        final McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);
         mcMMO.p.getServer().getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
@@ -786,7 +786,7 @@ public static void spawnItems(@Nullable Player player,
         }
 
         // We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event.
-        McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);
+        final McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);
         mcMMO.p.getServer().getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java
@@ -109,7 +109,7 @@ public static Location getBlockCenter(Block block) {
     }
 
     public static Location getBlockCenter(Location location) {
-        return location.add(0.5, 0.5, 0.5);
+        return location.clone().add(0.5, 0.5, 0.5);
     }
 
     public static void profileCleanup(@NotNull String playerName) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`Version 2.2.034`
	`2`	`+ Fixed bug where mcMMO would drop items in such a way that they get stuck in an adjacent block and float to the surface`
`2`	`3`	`Fixed a rare edge case where null entities during chunk unload would cause a NullPointerException and potentially lead to server instability`
`3`	`4`	`Fixed bug where arrow would award archery xp after a crossbow trickshot bounce`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@`
`39`	`39`
`40`	`40`	`import java.util.HashSet;`
`41`	`41`
	`42`	`+import static com.gmail.nossr50.util.Misc.getBlockCenter;`
	`43`	`+`
`42`	`44`	`public class BlockListener implements Listener {`
`43`	`45`	`private final mcMMO plugin;`
`44`	`46`
`@@ -103,11 +105,15 @@ public void onBlockDropItemEvent(BlockDropItemEvent event) {`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`if (event.getBlock().getMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS).size() > 0) {`
`106`		`- BonusDropMeta bonusDropMeta = (BonusDropMeta) event.getBlock().getMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS).get(0);`
	`108`	`+ final BonusDropMeta bonusDropMeta =`
	`109`	`+ (BonusDropMeta) event.getBlock().getMetadata(`
	`110`	`+ MetadataConstants.METADATA_KEY_BONUS_DROPS).get(0);`
`107`	`111`	`int bonusCount = bonusDropMeta.asInt();`
`108`		`-`
	`112`	`+ final Location centeredLocation = getBlockCenter(event.getBlock());`
`109`	`113`	`for (int i = 0; i < bonusCount; i++) {`
`110`		`- ItemUtils.spawnItemNaturally(event.getPlayer(), event.getBlockState().getLocation(), is, ItemSpawnReason.BONUS_DROPS);`
	`114`	`+`
	`115`	`+ ItemUtils.spawnItemNaturally(event.getPlayer(),`
	`116`	`+ centeredLocation, is, ItemSpawnReason.BONUS_DROPS);`
`111`	`117`	`}`
`112`	`118`	`}`
`113`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ public void excavationBlockCheck(Block block) {`
`50`	`50`
`51`	`51`	`if (!treasures.isEmpty()) {`
`52`	`52`	`int skillLevel = getSkillLevel();`
`53`		`- Location location = Misc.getBlockCenter(block);`
	`53`	`+ final Location centerOfBlock = Misc.getBlockCenter(block);`
`54`	`54`
`55`	`55`	`for (ExcavationTreasure treasure : treasures) {`
`56`	`56`	`if (skillLevel >= treasure.getDropLevel()`
`57`	`57`	`&& ProbabilityUtil.isStaticSkillRNGSuccessful(`
`58`	`58`	`PrimarySkillType.EXCAVATION, mmoPlayer, treasure.getDropProbability())) {`
`59`		`- processExcavationBonusesOnBlock(treasure, location);`
	`59`	`+ processExcavationBonusesOnBlock(treasure, centerOfBlock);`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ public static void spawnItems(@Nullable Player player,`
`759`	`759`	`}`
`760`	`760`
`761`	`761`	`// We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event.`
`762`		`- McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);`
	`762`	`+ final McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);`
`763`	`763`	`mcMMO.p.getServer().getPluginManager().callEvent(event);`
`764`	`764`
`765`	`765`	`if (event.isCancelled()) {`
`@@ -786,7 +786,7 @@ public static void spawnItems(@Nullable Player player,`
`786`	`786`	`}`
`787`	`787`
`788`	`788`	`// We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event.`
`789`		`- McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);`
	`789`	`+ final McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack, itemSpawnReason, player);`
`790`	`790`	`mcMMO.p.getServer().getPluginManager().callEvent(event);`
`791`	`791`
`792`	`792`	`if (event.isCancelled()) {`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public static Location getBlockCenter(Block block) {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public static Location getBlockCenter(Location location) {`
`112`		`- return location.add(0.5, 0.5, 0.5);`
	`112`	`+ return location.clone().add(0.5, 0.5, 0.5);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`public static void profileCleanup(@NotNull String playerName) {`