Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Back to development on Blast Mining.

Browse Source
This commit is contained in:
GJ 2012-02-14 19:01:33 -05:00
parent e94473b21b
commit 6e59087f6d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
View File

@ -16,9 +16,11 @@
*/ */
package com.gmail.nossr50.listeners; package com.gmail.nossr50.listeners;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -29,6 +31,8 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.ExplosionPrimeEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.Combat; import com.gmail.nossr50.Combat;
@ -40,6 +44,7 @@ import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.skills.Acrobatics; import com.gmail.nossr50.skills.Acrobatics;
import com.gmail.nossr50.skills.BlastMining;
import com.gmail.nossr50.skills.Skills; import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.skills.Taming; import com.gmail.nossr50.skills.Taming;
@ -81,6 +86,7 @@ public class mcEntityListener implements Listener
/* /*
* Demolitions Expert * Demolitions Expert
*/
if(event.getCause() == DamageCause.BLOCK_EXPLOSION) if(event.getCause() == DamageCause.BLOCK_EXPLOSION)
{ {
@ -90,12 +96,10 @@ public class mcEntityListener implements Listener
BlastMining.demolitionsExpertise(player, event); BlastMining.demolitionsExpertise(player, event);
} }
} }
*/
if(event.getEntity() instanceof LivingEntity) if(event.getEntity() instanceof LivingEntity)
{ {
//CraftEntity cEntity = (CraftEntity)event.getEntity();
//if(cEntity.getHandle() instanceof EntityLiving)
{ {
LivingEntity entityliving = (LivingEntity)event.getEntity(); LivingEntity entityliving = (LivingEntity)event.getEntity();
if(entityliving.getNoDamageTicks() < entityliving.getMaximumNoDamageTicks()/2.0F) if(entityliving.getNoDamageTicks() < entityliving.getMaximumNoDamageTicks()/2.0F)
@ -188,11 +192,7 @@ public class mcEntityListener implements Listener
plugin.misc.addToBleedRemovalQue((LivingEntity)x); plugin.misc.addToBleedRemovalQue((LivingEntity)x);
Skills.arrowRetrievalCheck(x, plugin); Skills.arrowRetrievalCheck(x, plugin);
/*
if(Config.getInstance().isMobSpawnTracked(x)){
Config.getInstance().removeMobSpawnTrack(x);
}
*/
if(x instanceof Player){ if(x instanceof Player){
Player player = (Player)x; Player player = (Player)x;
Users.getProfile(player).setBleedTicks(0); Users.getProfile(player).setBleedTicks(0);
@ -211,7 +211,6 @@ public class mcEntityListener implements Listener
} }
} }
/*
@EventHandler (priority = EventPriority.LOW) @EventHandler (priority = EventPriority.LOW)
public void onExplosionPrime(ExplosionPrimeEvent event) public void onExplosionPrime(ExplosionPrimeEvent event)
{ {
@ -242,7 +241,6 @@ public class mcEntityListener implements Listener
} }
} }
} }
*/
public boolean isBow(ItemStack is){ public boolean isBow(ItemStack is){
if (is.getTypeId() == 261){ if (is.getTypeId() == 261){