JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed GadgetActivateEvent to GadgetEnable event 

Some files didn't make it to prev commit
This commit is contained in:
xGamingDudex 2015-12-11 01:07:47 +01:00
parent a6a4c8be36
commit 5b0909012d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -28,7 +28,7 @@ import mineplex.core.disguise.DisguiseManager;
import mineplex.core.disguise.disguises.DisguiseSlime; import mineplex.core.disguise.disguises.DisguiseSlime;
import mineplex.core.donation.DonationManager; import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.event.GadgetActivateEvent; import mineplex.core.gadget.event.GadgetEnableEvent;
import mineplex.core.gadget.event.GadgetCollideEntityEvent; import mineplex.core.gadget.event.GadgetCollideEntityEvent;
import mineplex.core.gadget.types.GadgetType; import mineplex.core.gadget.types.GadgetType;
import mineplex.core.giveaway.GiveawayManager; import mineplex.core.giveaway.GiveawayManager;
@ -949,7 +949,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
} }
@EventHandler @EventHandler
public void GadgetActivate(GadgetActivateEvent event) public void GadgetActivate(GadgetEnableEvent event)
{ {
if (!_gadgetsEnabled) if (!_gadgetsEnabled)
event.setCancelled(true); event.setCancelled(true);

4
Plugins/Mineplex.Hub/src/mineplex/hub/commands/DisguiseCommand.java
View File

@ -16,7 +16,7 @@ import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.donation.Donor; import mineplex.core.donation.Donor;
import mineplex.core.gadget.event.GadgetActivateEvent; import mineplex.core.gadget.event.GadgetEnableEvent;
import mineplex.core.gadget.types.Gadget; import mineplex.core.gadget.types.Gadget;
import mineplex.core.gadget.types.GadgetType; import mineplex.core.gadget.types.GadgetType;
import mineplex.core.treasure.event.TreasureStartEvent; import mineplex.core.treasure.event.TreasureStartEvent;
@ -285,7 +285,7 @@ public class DisguiseCommand extends CommandBase<HubManager> implements Listener
} }
@EventHandler @EventHandler
public void gadget(GadgetActivateEvent event) public void gadget(GadgetEnableEvent event)
{ {
if(!event.getGadget().GetName().equalsIgnoreCase("Coin Party Bomb") && event.getGadget().getGadgetType() != GadgetType.Morph) if(!event.getGadget().GetName().equalsIgnoreCase("Coin Party Bomb") && event.getGadget().getGadgetType() != GadgetType.Morph)
return; return;

4
Plugins/Mineplex.Hub/src/mineplex/hub/modules/KothManager.java
View File

@ -22,7 +22,7 @@ import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.event.GadgetActivateEvent; import mineplex.core.gadget.event.GadgetEnableEvent;
import mineplex.core.gadget.gadgets.item.ItemDuelingSword; import mineplex.core.gadget.gadgets.item.ItemDuelingSword;
import mineplex.core.gadget.gadgets.outfit.OutfitTeam; import mineplex.core.gadget.gadgets.outfit.OutfitTeam;
import mineplex.core.gadget.types.Gadget; import mineplex.core.gadget.types.Gadget;
@ -214,7 +214,7 @@ public class KothManager extends MiniPlugin
} }
@EventHandler @EventHandler
public void disableGadgets(GadgetActivateEvent event) public void disableGadgets(GadgetEnableEvent event)
{ {
if (isKothMode(event.getPlayer())) if (isKothMode(event.getPlayer()))
event.setCancelled(true); event.setCancelled(true);

6
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
View File

@ -36,7 +36,7 @@ import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilEvent.ActionType; import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.donation.DonationManager; import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.event.GadgetActivateEvent; import mineplex.core.gadget.event.GadgetEnableEvent;
import mineplex.core.gadget.event.GadgetBlockEvent; import mineplex.core.gadget.event.GadgetBlockEvent;
import mineplex.core.gadget.types.MusicGadget; import mineplex.core.gadget.types.MusicGadget;
import mineplex.core.mount.event.MountActivateEvent; import mineplex.core.mount.event.MountActivateEvent;
@ -138,7 +138,7 @@ public class ParkourManager extends MiniPlugin
} }
@EventHandler @EventHandler
public void disableGadgets(GadgetActivateEvent event) public void disableGadgets(GadgetEnableEvent event)
{ {
if (isParkourMode(event.getPlayer())) if (isParkourMode(event.getPlayer()))
event.setCancelled(true); event.setCancelled(true);
@ -460,7 +460,7 @@ public class ParkourManager extends MiniPlugin
} }
@EventHandler @EventHandler
public void musicDisable(GadgetActivateEvent event) public void musicDisable(GadgetEnableEvent event)
{ {
if (event.getGadget() instanceof MusicGadget) if (event.getGadget() instanceof MusicGadget)
{ {

4
Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java
View File

@ -41,7 +41,7 @@ import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTextMiddle; import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.event.GadgetActivateEvent; import mineplex.core.gadget.event.GadgetEnableEvent;
import mineplex.core.gadget.gadgets.outfit.OutfitTeam; import mineplex.core.gadget.gadgets.outfit.OutfitTeam;
import mineplex.core.gadget.types.Gadget; import mineplex.core.gadget.types.Gadget;
import mineplex.core.gadget.types.GadgetType; import mineplex.core.gadget.types.GadgetType;
@ -491,7 +491,7 @@ public class SoccerManager extends MiniPlugin
} }
@EventHandler @EventHandler
public void disableGadgets(GadgetActivateEvent event) public void disableGadgets(GadgetEnableEvent event)
{ {
if (isSoccerMode(event.getPlayer())) if (isSoccerMode(event.getPlayer()))
event.setCancelled(true); event.setCancelled(true);