Browse Source

Cleaned out more traces of old event system.

GJ 13 years ago
parent
commit
0dd9bc1cda

+ 1 - 1
src/main/java/com/gmail/nossr50/Combat.java

@@ -42,7 +42,7 @@ public class Combat
 {
 	public static void combatChecks(EntityDamageByEntityEvent event, mcMMO pluginx)
 	{
-		if(event.isCancelled() || event.getDamage() == 0 || event.getEntity().isDead())
+		if(event.getDamage() == 0 || event.getEntity().isDead())
 			return;
 		
 		//Declare Things

+ 1 - 1
src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java

@@ -118,7 +118,7 @@ public class mcEntityListener implements Listener
     				Acrobatics.acrobaticsCheck(player, event);
     			if(cause == DamageCause.BLOCK_EXPLOSION && mcPermissions.getInstance().blastMining(player))
     				BlastMining.demolitionsExpertise(player, event);
-    			if(!event.isCancelled() && event.getDamage() >= 1)
+    			if(event.getDamage() >= 1)
     				PP.setRecentlyHurt(System.currentTimeMillis());
     		}
     		break;

+ 9 - 9
src/main/java/com/gmail/nossr50/skills/Acrobatics.java

@@ -36,7 +36,7 @@ public class Acrobatics {
 		if(player.isSneaking())
 			acrovar = acrovar * 2;
 		
-		if(Math.random() * 1000 <= acrovar && !event.isCancelled())
+		if(Math.random() * 1000 <= acrovar)
 		{
 			int threshold = 7;
 			
@@ -51,9 +51,9 @@ public class Acrobatics {
 			/*
 			 * Check for death
 			 */
-			if(player.getHealth() - newDamage >= 1){
-				if(!event.isCancelled())
-					PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 8)*10, player);
+			if(player.getHealth() - newDamage >= 1)
+			{
+				PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 8)*10, player);
 				Skills.XpCheckSkill(SkillType.ACROBATICS, player);
 				event.setDamage(newDamage);
 				if(event.getDamage() <= 0)
@@ -64,11 +64,11 @@ public class Acrobatics {
 					player.sendMessage("**ROLL**");
 				}
 			}
-		} else if (!event.isCancelled()){
-			if(player.getHealth() - event.getDamage() >= 1){
-				PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, player);
-				Skills.XpCheckSkill(SkillType.ACROBATICS, player);
-			}
+		} 
+		else if(player.getHealth() - event.getDamage() >= 1)
+		{
+			PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, player);
+			Skills.XpCheckSkill(SkillType.ACROBATICS, player);
 		}
     }
 	public static void dodgeChecks(EntityDamageByEntityEvent event){