Mirrors/mcMMO
1
0
Fork 1
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-21 11:13:00 +01:00
Code Packages Releases Activity

Merge branch 'master' into configurable

Browse Source
This commit is contained in:
Shane Freeder
2019-09-26 08:46:24 +01:00
parent 7f94f3833d 0d6b5e2530
commit fd7bcc4a32
37 changed files with 2708 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/util/EventManager.java
View File

@@ -22,6 +22,7 @@ import com.gmail.nossr50.events.party.McMMOPartyLevelUpEvent;
import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
import com.gmail.nossr50.events.party.McMMOPartyXpGainEvent;
import com.gmail.nossr50.events.skills.McMMOPlayerNotificationEvent;
import com.gmail.nossr50.events.players.McMMOPlayerProfileLoadEvent;
import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityDeactivateEvent;
import com.gmail.nossr50.events.skills.fishing.McMMOPlayerFishingTreasureEvent;
@@ -67,11 +68,8 @@ public class EventManager {
* @param event this event
* @return true if damage is NOT from an unnatural mcMMO skill (such as bleed DOTs)
*/
public boolean isDamageFromMcMMOComplexBehaviour(Event event) {
if (event instanceof FakeEntityDamageEvent) {
return true;
}
return false;
public static boolean isDamageFromMcMMOComplexBehaviour(Event event) {
return event instanceof FakeEntityDamageEvent;
}
/**
@@ -172,6 +170,13 @@ public class EventManager {
return event;
}
public static McMMOPlayerProfileLoadEvent callPlayerProfileLoadEvent(Player player, PlayerProfile profile){
McMMOPlayerProfileLoadEvent event = new McMMOPlayerProfileLoadEvent(player, profile);
mcMMO.p.getServer().getPluginManager().callEvent(event);
return event;
}
/**
* Calls a new SubSkillEvent for this SubSkill and then returns it
*