EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Moving the FakeEntityDamageByEntity event to the top of the listener

Browse Source
This commit is contained in:
nossr50 2012-03-02 16:34:35 -08:00
parent 14f1a91eeb
commit cb9a9282dd
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/gmail/nossr50/Combat.java
View File

@ -67,7 +67,7 @@ public class Combat
if(!pluginx.misc.bleedTracker.contains(target)) //Bleed if(!pluginx.misc.bleedTracker.contains(target)) //Bleed
Swords.bleedCheck(attacker, target, pluginx); Swords.bleedCheck(attacker, target, pluginx);
if (!(event instanceof FakeEntityDamageByEntityEvent) && PPa.getSerratedStrikesMode()) if (PPa.getSerratedStrikesMode())
Swords.applySerratedStrikes(attacker, event, pluginx); Swords.applySerratedStrikes(attacker, event, pluginx);
if(target instanceof Player) if(target instanceof Player)
@ -82,13 +82,10 @@ public class Combat
Axes.axeCriticalCheck(attacker, event, pluginx); //Critical hit Axes.axeCriticalCheck(attacker, event, pluginx); //Critical hit
//Impact //Impact
if(!(event instanceof FakeEntityDamageByEntityEvent)) Axes.impact(attacker, target);
{
Axes.impact(attacker, target);
if (PPa.getSkullSplitterMode()) if (PPa.getSkullSplitterMode())
Axes.applyAoeDamage(attacker, event, pluginx); Axes.applyAoeDamage(attacker, event, pluginx);
}
if(target instanceof Player) if(target instanceof Player)
PvPExperienceGain(attacker, PPa, (Player) target, event.getDamage(), SkillType.AXES); PvPExperienceGain(attacker, PPa, (Player) target, event.getDamage(), SkillType.AXES);

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

@ -46,6 +46,7 @@ import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.events.FakeEntityDamageByEntityEvent;
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.Archery; import com.gmail.nossr50.skills.Archery;
@ -65,6 +66,10 @@ public class mcEntityListener implements Listener
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) public void onEntityDamageByEntity(EntityDamageByEntityEvent event)
{ {
//Lets just put this here...
if(event instanceof FakeEntityDamageByEntityEvent)
return;
Entity defender = event.getEntity(); Entity defender = event.getEntity();
Entity attacker = event.getDamager(); Entity attacker = event.getDamager();