Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-04 06:21:35 +01:00
Code Issues Projects Releases Wiki Activity

Add FlyStatusChangeEvent (#835)

Browse Source
This commit is contained in:
Faris Rehman 2016-08-27 03:45:38 +01:00 committed by Blinky™
parent 58828d7924
commit f42904e5ae
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Essentials/src/com/earth2me/essentials/commands/Commandfly.java
View File

@ -3,10 +3,10 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import org.bukkit.Server; import org.bukkit.Server;
import net.ess3.api.events.FlyStatusChangeEvent;
import static com.earth2me.essentials.I18n.tl; import static com.earth2me.essentials.I18n.tl;
public class Commandfly extends EssentialsToggleCommand { public class Commandfly extends EssentialsToggleCommand {
public Commandfly() { public Commandfly() {
super("fly", "essentials.fly.others"); super("fly", "essentials.fly.others");
@ -27,17 +27,23 @@ public class Commandfly extends EssentialsToggleCommand {
if (enabled == null) { if (enabled == null) {
enabled = !user.getBase().getAllowFlight(); enabled = !user.getBase().getAllowFlight();
} }
+ final User controller = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
FlyStatusChangeEvent event = new FlyStatusChangeEvent(user, controller, enabled);
ess.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
user.getBase().setFallDistance(0f);
user.getBase().setAllowFlight(enabled);
user.getBase().setFallDistance(0f); if (!user.getBase().getAllowFlight()) {
user.getBase().setAllowFlight(enabled); user.getBase().setFlying(false);
}
if (!user.getBase().getAllowFlight()) { user.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
user.getBase().setFlying(false); if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) {
} sender.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
}
user.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) {
sender.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
} }
} }
} }

9
Essentials/src/net/ess3/api/events/FlyStatusChangeEvent.java Normal file
View File

@ -0,0 +1,9 @@
package net.ess3.api.events;
import net.ess3.api.IUser;
public class FlyStatusChangeEvent extends StatusChangeEvent {
public FlyStatusChangeEvent(IUser affected, IUser controller, boolean value) {
super(affected, controller, value);
}
}