minor UHC fix

This commit is contained in:
Chiss 2014-10-13 14:09:58 +11:00
parent 9b1c4783ce
commit e41b10ccb8
3 changed files with 9 additions and 4 deletions

View File

@ -302,9 +302,9 @@ public class AntiHack extends MiniPlugin
out = out.substring(0, out.length() - 2); out = out.substring(0, out.length() - 2);
String severity; String severity;
if (total > (_strict ? 6 : 15)) severity = "Extreme"; if (total > (_strict ? 6 : 18)) severity = "Extreme";
else if (total > (_strict ? 4 : 10)) severity = "High"; else if (total > (_strict ? 4 : 12)) severity = "High";
else if (total > (_strict ? 2 : 5)) severity = "Medium"; else if (total > (_strict ? 2 : 6)) severity = "Medium";
else severity = "Low"; else severity = "Low";
//Send Report //Send Report

View File

@ -37,6 +37,8 @@ public abstract class ParticleGadget extends Gadget
if (player.getGameMode() != GameMode.SURVIVAL) if (player.getGameMode() != GameMode.SURVIVAL)
return false; return false;
if (Manager.hideParticles()) if (Manager.hideParticles())
return false; return false;

View File

@ -894,12 +894,15 @@ public class UHC extends TeamGame
event.setCancelled(true); event.setCancelled(true);
} }
@EventHandler @EventHandler(priority = EventPriority.MONITOR)
public void HeadPickup(PlayerPickupItemEvent event) public void HeadPickup(PlayerPickupItemEvent event)
{ {
if (!IsLive()) if (!IsLive())
return; return;
if (event.isCancelled())
return;
if (event.getItem().getItemStack().getType() == Material.SKULL_ITEM) if (event.getItem().getItemStack().getType() == Material.SKULL_ITEM)
{ {
UtilPlayer.message(event.getPlayer(), " "); UtilPlayer.message(event.getPlayer(), " ");