Skip to content

Commit

Permalink
improve previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed Apr 19, 2019
1 parent 65ddf1a commit 3e9f4e4
Show file tree
Hide file tree
Showing 19 changed files with 0 additions and 41 deletions.
Expand Up @@ -88,9 +88,7 @@ public dObject getContext(String name) {
@EventHandler
public void onPlayerAFKStatus(AfkStatusChangeEvent event) {
afk = new Element(event.getValue());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -86,9 +86,7 @@ public dObject getContext(String name) {
@EventHandler
public void onPlayerAFKStatus(GodStatusChangeEvent event) {
god = new Element(event.getValue());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -90,9 +90,7 @@ public dObject getContext(String name) {
@EventHandler
public void onPlayerAFKStatus(JailStatusChangeEvent event) {
jailed = new Element(event.getValue());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -90,9 +90,7 @@ public dObject getContext(String name) {
@EventHandler
public void onPlayerAFKStatus(MuteStatusChangeEvent event) {
muted = new Element(event.getValue());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -122,9 +122,7 @@ public void onPlayerEntersExitsGPClaim(PlayerMoveEvent event) {
}
new_claim = tclaim == null ? null : new GriefPreventionClaim(tclaim);
old_claim = fclaim == null ? null : new GriefPreventionClaim(fclaim);
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -93,10 +93,7 @@ else if (name.equals("disguise")) {
public void onDisguise(DisguiseEvent event) {
disguise = new LibsDisguise(event.getDisguise());
entity = new dEntity(event.getEntity());

cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -93,10 +93,7 @@ else if (name.equals("disguise")) {
public void onUndisguise(UndisguiseEvent event) {
disguise = new LibsDisguise(event.getDisguise());
entity = new dEntity(event.getEntity());

cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -113,10 +113,8 @@ public void onmcMMOPlayerLevelChanges(McMMOPlayerXpGainEvent event) {
cause = new Element(event.getXpGainReason().toString());
skill = new Element(event.getSkill().getName());
xp = new Element(event.getRawXpGained());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
event.setRawXpGained(xp.asFloat());
}
}
Expand Up @@ -112,9 +112,7 @@ public void onmcMMOPlayerLevelChanges(McMMOPlayerLevelChangeEvent event) {
level = event.getSkillLevel();
cause = event.getXpGainReason().toString();
skill = new Element(event.getSkill().getName());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -123,10 +123,8 @@ public void onmcMMOPlayerLevelDown(McMMOPlayerLevelDownEvent event) {
new_level = event.getSkillLevel();
cause = new Element(event.getXpGainReason().toString());
skill = new Element(event.getSkill().getName());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
event.setLevelsLost(levels_lost);
}
}
Expand Up @@ -124,10 +124,8 @@ public void onmcMMOPlayerLevelUp(McMMOPlayerLevelUpEvent event) {
new_level = event.getSkillLevel();
cause = event.getXpGainReason().toString();
skill = new Element(event.getSkill().getName());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
event.setLevelsGained(levels_gained);
}
}
Expand Up @@ -78,9 +78,7 @@ public dObject getContext(String name) {
@EventHandler
public void onMobArenaStarts(ArenaStartEvent event) {
arena = new MobArenaArena(event.getArena());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -83,10 +83,7 @@ public dObject getContext(String name) {
@EventHandler
public void onPlotClear(PlotClearEvent event) {
plot = new dPlotSquaredPlot(event.getPlot());

cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -85,9 +85,7 @@ public void onPVPArenaStart(PAStartEvent event) {
fighters.add(new dPlayer(p.get()).identify());
}
arena = new PVPArenaArena(event.getArena());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -75,9 +75,7 @@ public dObject getContext(String name) {
@EventHandler
public void onPlayerJoinsPVPArena(PAJoinEvent event) {
arena = new PVPArenaArena(event.getArena());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -79,9 +79,7 @@ public dObject getContext(String name) {
public void onSentinelAttack(SentinelAttackEvent event) {
npc = new dNPC(event.getNPC());
entity = new dEntity(event.getNPC().getTrait(SentinelTrait.class).chasing).getDenizenObject();
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -84,9 +84,7 @@ public void onShopKeeperTrade(ShopkeeperTradeEvent event) {
player = dPlayer.mirrorBukkitPlayer(event.getPlayer());
keeper = new ShopKeeper(event.getShopkeeper());
recipe = ShopKeeper.wrapTradingRecipe(event.getTradingRecipe());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -107,9 +107,7 @@ public void onSkillAPIPlayerDowngradesSkill(PlayerSkillDowngradeEvent event) {
level = new Element(event.getDowngradedSkill().getLevel());
refund = new Element(event.getRefund());
skill = new Element(event.getDowngradedSkill().getData().getName());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}
Expand Up @@ -107,9 +107,7 @@ public void onSkillAPIPlayerUpgradesSkill(PlayerSkillUpgradeEvent event) {
level = new Element(event.getUpgradedSkill().getLevel());
cost = new Element(event.getCost());
skill = new Element(event.getUpgradedSkill().getData().getName());
cancelled = event.isCancelled();
this.event = event;
fire(event);
fire(event);;
}
}

0 comments on commit 3e9f4e4

Please sign in to comment.