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

Add potion effect clearing on /heal - Chris Ward

Browse Source
This commit is contained in:
KHobbits 2012-09-28 20:55:37 +01:00
parent db6512b702
commit c0a176825c
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
View File

@ -15,8 +15,6 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.event.entity.*; import org.bukkit.event.entity.*;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
public class EssentialsEntityListener implements Listener public class EssentialsEntityListener implements Listener
@ -170,14 +168,10 @@ public class EssentialsEntityListener implements Listener
{ {
for (LivingEntity entity : event.getAffectedEntities()) for (LivingEntity entity : event.getAffectedEntities())
{ {
if (entity instanceof Player) if (entity instanceof Player && ess.getUser(entity).isGodModeEnabled())
{ {
User user = ess.getUser(entity); event.setIntensity(entity, 0d);
if (user.isGodModeEnabled())
{
event.setIntensity(entity, 0d);
}
} }
} }
} }
} }

21
Essentials/src/com/earth2me/essentials/commands/Commandheal.java
View File

@ -6,6 +6,8 @@ import java.util.List;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
public class Commandheal extends EssentialsCommand public class Commandheal extends EssentialsCommand
@ -33,9 +35,7 @@ public class Commandheal extends EssentialsCommand
{ {
user.healCooldown(); user.healCooldown();
} }
user.setHealth(20); healPlayer(user);
user.setFoodLevel(20);
user.sendMessage(_("heal"));
} }
@Override @Override
@ -63,10 +63,19 @@ public class Commandheal extends EssentialsCommand
{ {
continue; continue;
} }
p.setHealth(20); healPlayer(p);
p.setFoodLevel(20);
p.sendMessage(_("heal"));
sender.sendMessage(_("healOther", p.getDisplayName())); sender.sendMessage(_("healOther", p.getDisplayName()));
} }
} }
private void healPlayer(final Player p)
{
p.setHealth(20);
p.setFoodLevel(20);
p.sendMessage(_("heal"));
for (PotionEffect effect : p.getActivePotionEffects())
{
p.removePotionEffect(effect.getType());
}
}
} }