EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix giving double treasures if the setting to give extra fish is on

Browse Source 
Fixes #4363
This commit is contained in:
nossr50 2020-12-31 15:53:01 -08:00
parent 8ee405fbfd
commit 3f6de1c4ba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -7,7 +7,7 @@ Version 2.1.165
mcMMO will now be compatible with changes to world height (1.17 compatibility) mcMMO will now be compatible with changes to world height (1.17 compatibility)
Added missing cooldown locale message 'Commands.Database.Cooldown' Added missing cooldown locale message 'Commands.Database.Cooldown'
Added new locale message 'Taming.Summon.COTW.Removed' Added new locale message 'Taming.Summon.COTW.Removed'
mcMMO will ignore PlayerPickupItem events from "Fake-Player" NPCs if it recognizes them as such, this will prevent some issues mcMMO will ignore EntityPickupItemEvents from "Fake-Player" NPCs if it recognizes them as such, this will prevent some compatibility issues with some plugins
NOTES: NOTES:
Books dropped before this fix will not be usable and should just be chucked in lava, the broken books have blue names, the working books have yellow names. Books dropped before this fix will not be usable and should just be chucked in lava, the broken books have blue names, the working books have yellow names.

4
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -449,11 +449,11 @@ public class FishingManager extends SkillManager {
} }
if(fishingSucceeds) { if(fishingSucceeds) {
fishingCatch.setItemStack(treasureDrop);
if (Config.getInstance().getFishingExtraFish()) { if (Config.getInstance().getFishingExtraFish()) {
Misc.spawnItem(player.getEyeLocation(), fishingCatch.getItemStack(), ItemSpawnReason.FISHING_EXTRA_FISH); Misc.spawnItem(player.getEyeLocation(), fishingCatch.getItemStack(), ItemSpawnReason.FISHING_EXTRA_FISH);
} }
fishingCatch.setItemStack(treasureDrop);
} }
applyXpGain(fishXp + treasureXp, XPGainReason.PVE); applyXpGain(fishXp + treasureXp, XPGainReason.PVE);