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

Fixed plugin incompatibility and exploits regarding buffed tools remaining buffed

Browse Source 
Fixes #4616
This commit is contained in:
nossr50 2021-08-10 14:04:59 -07:00
parent 64f1ae4af6
commit f91a2217c8
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -1,4 +1,5 @@
Version 2.1.201 Version 2.1.201
Fixed an exploit related to Ability Buffs remaining on tools
Blast Mining no longer drops Budding Amethyst since its not legal to obtain this item through normal gameplay Blast Mining no longer drops Budding Amethyst since its not legal to obtain this item through normal gameplay
Added mcinspect and mmoinspect aliases to inspect command Added mcinspect and mmoinspect aliases to inspect command
Portuguese translation of Woodcutting changed back to Lenhador Portuguese translation of Woodcutting changed back to Lenhador

1
src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
View File

@ -402,6 +402,7 @@ public class InventoryListener implements Listener {
} }
SkillUtils.removeAbilityBuff(event.getCurrentItem()); SkillUtils.removeAbilityBuff(event.getCurrentItem());
if (event.getAction() == InventoryAction.HOTBAR_SWAP) { if (event.getAction() == InventoryAction.HOTBAR_SWAP) {
if(isOutsideWindowClick(event)) if(isOutsideWindowClick(event))
return; return;

24
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -6,6 +6,7 @@ import com.gmail.nossr50.datatypes.chat.ChatChannel;
import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.interfaces.Skill;
import com.gmail.nossr50.datatypes.skills.subskills.taming.CallOfTheWildType; import com.gmail.nossr50.datatypes.skills.subskills.taming.CallOfTheWildType;
import com.gmail.nossr50.events.McMMOReplaceVanillaTreasureEvent; import com.gmail.nossr50.events.McMMOReplaceVanillaTreasureEvent;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent; import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
@ -212,6 +213,11 @@ public class PlayerListener implements Listener {
} }
} }
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
public void onPlayerDeathNormal(PlayerDeathEvent playerDeathEvent) {
SkillUtils.removeAbilityBoostsFromInventory(playerDeathEvent.getEntity());
}
/** /**
* Monitor PlayerChangedWorldEvents. * Monitor PlayerChangedWorldEvents.
* <p> * <p>
@ -1031,17 +1037,9 @@ public class PlayerListener implements Listener {
} }
} }
// @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
// @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
// public void onPlayerStatisticIncrementEvent(PlayerStatisticIncrementEvent event) { SkillUtils.removeAbilityBuff(event.getMainHandItem());
// /* WORLD BLACKLIST CHECK */ SkillUtils.removeAbilityBuff(event.getOffHandItem());
// if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) }
// return;
//
// if (!mcMMO.getHolidayManager().isAprilFirst()) {
// return;
// }
//
// mcMMO.getHolidayManager().handleStatisticEvent(event);
// }
} }