EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-10-31 01:03:44 +01:00
Code Issues Projects Releases Wiki Activity

removed unnecessary getPlayer() calls.

Browse Source 
clarified comment
clarified location variable name

Signed-off-by: Momshroom <Momshroom@gmail.com>
This commit is contained in:
Momshroom
2024-05-23 18:58:24 -05:00
parent e95b3c3a05
commit b55ac12130
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java
View File

@@ -316,22 +316,22 @@ public class WoodcuttingManager extends SkillManager {
xp += processTreeFellerXPGains(blockState, processedLogCount); xp += processTreeFellerXPGains(blockState, processedLogCount);
//Drop displaced block //Drop displaced block
Misc.spawnItemsFromCollection(getPlayer(), Misc.getBlockCenter(blockState), block.getDrops(itemStack), ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK); Misc.spawnItemsFromCollection(player, Misc.getBlockCenter(blockState), block.getDrops(itemStack), ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK);
//Bonus Drops / Harvest lumber checks //Bonus Drops / Harvest lumber checks
processBonusDropCheck(blockState); processBonusDropCheck(blockState);
} else if (BlockUtils.isNonWoodPartOfTree(blockState)) { } else if (BlockUtils.isNonWoodPartOfTree(blockState)) {
// 75% of the time do not drop leaf blocks // 75% of the time do not drop leaf blocks
if (ThreadLocalRandom.current().nextInt(100) > 75) { if (ThreadLocalRandom.current().nextInt(100) > 75) {
Misc.spawnItemsFromCollection(getPlayer(), Misc.spawnItemsFromCollection(player,
Misc.getBlockCenter(blockState), Misc.getBlockCenter(blockState),
block.getDrops(itemStack), block.getDrops(itemStack),
ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK); ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK);
} }
// drop saplings as occur in rest if Knock on Wood unlocked. // if KnockOnWood is unlocked, then drop any saplings from the remaining blocks
else if (RankUtils.hasUnlockedSubskill(player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) { else if (RankUtils.hasUnlockedSubskill(player, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) {
Misc.spawnItemIfSapling(getPlayer(), Misc.getBlockCenter(blockState), Misc.spawnItemIfSapling(player, Misc.getBlockCenter(blockState),
block.getDrops(itemStack),ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK);; block.getDrops(itemStack),ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK);
} }
//Drop displaced non-woodcutting XP blocks //Drop displaced non-woodcutting XP blocks

4
src/main/java/com/gmail/nossr50/util/Misc.java
View File

@@ -132,12 +132,12 @@ public final class Misc {
* Drops the item from the item stack only if it is a sapling (or equivalent) * Drops the item from the item stack only if it is a sapling (or equivalent)
* Needed for TreeFeller * Needed for TreeFeller
*/ */
public static void spawnItemIfSapling(@NotNull Player player, @NotNull Location location, @NotNull Collection < ItemStack > drops, @NotNull ItemSpawnReason itemSpawnReason) { public static void spawnItemIfSapling(@NotNull Player player, @NotNull Location spawnLocation, @NotNull Collection <ItemStack> drops, @NotNull ItemSpawnReason itemSpawnReason) {
String dropString; String dropString;
for (ItemStack drop : drops) { for (ItemStack drop : drops) {
dropString = drop.getType().getKey().getKey(); dropString = drop.getType().getKey().getKey();
if (dropString.contains("sapling") || dropString.contains("propagule")) { if (dropString.contains("sapling") || dropString.contains("propagule")) {
Misc.spawnItem(player, location, drop, itemSpawnReason); spawnItem(player, spawnLocation, drop, itemSpawnReason);
} }
} }
} }