minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-17 12:01:20 +02:00
Code Issues Releases Wiki Activity

implement GodStatusChangeEvent

Browse Source
This commit is contained in:
Iaccidentally
2013-10-10 20:26:39 -04:00
committed by KHobbits
parent cc34c02623
commit 375caa6f9e
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Essentials/src/com/earth2me/essentials/commands/Commandgod.java
View File

@@ -2,8 +2,10 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import net.ess3.api.events.GodStatusChangeEvent;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class Commandgod extends EssentialsToggleCommand public class Commandgod extends EssentialsToggleCommand
@@ -35,7 +37,7 @@ public class Commandgod extends EssentialsToggleCommand
} }
} }
else if (args.length == 2 && user.isAuthorized(othersPermission)) else if (args.length == 2 && user.isAuthorized(othersPermission))
{ {
toggleOtherPlayers(server, user.getBase(), args); toggleOtherPlayers(server, user.getBase(), args);
} }
else else
@@ -47,23 +49,29 @@ public class Commandgod extends EssentialsToggleCommand
@Override @Override
void togglePlayer(CommandSender sender, User user, Boolean enabled) void togglePlayer(CommandSender sender, User user, Boolean enabled)
{ {
if (enabled == null) final User controller = sender instanceof Player ? ess.getUser(sender) : null;
final GodStatusChangeEvent godEvent = new GodStatusChangeEvent(controller, user, enabled);
ess.getServer().getPluginManager().callEvent(godEvent);
if (!godEvent.isCancelled())
{ {
enabled = !user.isGodModeEnabled(); if (enabled == null)
} {
enabled = !user.isGodModeEnabled();
user.setGodModeEnabled(enabled); }
if (enabled && user.getHealth() != 0) user.setGodModeEnabled(enabled);
{
user.setHealth(user.getMaxHealth());
user.setFoodLevel(20);
}
user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled"))); if (enabled && user.getHealth() != 0)
if (!sender.equals(user.getBase())) {
{ user.setHealth(user.getMaxHealth());
sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName()))); user.setFoodLevel(20);
}
user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled")));
if (!sender.equals(user.getBase()))
{
sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName())));
}
} }
} }
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View File

@@ -4,7 +4,6 @@ import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.events.LocalChatSpyEvent;
import net.ess3.api.events.NickChangeEvent; import net.ess3.api.events.NickChangeEvent;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -115,7 +114,7 @@ public class Commandnick extends EssentialsLoopCommand
|| lowerNick.equals(onlinePlayer.getName().toLowerCase(Locale.ENGLISH))) || lowerNick.equals(onlinePlayer.getName().toLowerCase(Locale.ENGLISH)))
{ {
return true; return true;
} }
} }
if (ess.getUser(lowerNick) != null && ess.getUser(lowerNick) != target) { if (ess.getUser(lowerNick) != null && ess.getUser(lowerNick) != target) {
return true; return true;

1
Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java
View File

@@ -1,6 +1,5 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.util.List; import java.util.List;
import org.bukkit.Server; import org.bukkit.Server;