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

Fixing more breaks from the static abuse removal

Browse Source
This commit is contained in:
nossr50
2019-09-25 14:21:11 -07:00
parent 297ce64a24
commit 8ad08298d0
8 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,8 +165,8 @@ public class EventManager {
* Others
*/
public McMMOPlayerAbilityActivateEvent callPlayerAbilityActivateEvent(Player player, PrimarySkillType skill) {
McMMOPlayerAbilityActivateEvent event = new McMMOPlayerAbilityActivateEvent(player, skill);
public McMMOPlayerAbilityActivateEvent callPlayerAbilityActivateEvent(Player player, PrimarySkillType primarySkillType, SuperAbilityType superAbilityType) {
McMMOPlayerAbilityActivateEvent event = new McMMOPlayerAbilityActivateEvent(player, primarySkillType, superAbilityType);
pluginRef.getServer().getPluginManager().callEvent(event);
return event;
@@ -180,8 +180,8 @@ public class EventManager {
* @return the event after it has been fired
*/
@Deprecated
public SubSkillEvent callSubSkillEvent(Player player, SubSkillType subSkillType) {
SubSkillEvent event = new SubSkillEvent(player, subSkillType);
public SubSkillEvent callSubSkillEvent(Player player, SubSkillType subSkillType, PrimarySkillType primarySkillType) {
SubSkillEvent event = new SubSkillEvent(player, subSkillType, primarySkillType);
pluginRef.getServer().getPluginManager().callEvent(event);
return event;
@@ -412,7 +412,7 @@ public class EventManager {
}
public void callAbilityDeactivateEvent(Player player, SuperAbilityType superAbilityType) {
McMMOPlayerAbilityDeactivateEvent event = new McMMOPlayerAbilityDeactivateEvent(player, pluginRef.getSkillTools().getPrimarySkillBySuperAbility(superAbilityType));
McMMOPlayerAbilityDeactivateEvent event = new McMMOPlayerAbilityDeactivateEvent(player, pluginRef.getSkillTools().getPrimarySkillBySuperAbility(superAbilityType), superAbilityType);
pluginRef.getServer().getPluginManager().callEvent(event);
}