EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 10:14:43 +02:00
Code Issues Projects Releases Wiki Activity

Modified mcMMO's onEntityDamage to have better compatibility.

Browse Source
This commit is contained in:
nossr50
2012-02-13 08:06:46 -08:00
parent 1910b76b13
commit 786a5f9325
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.Combat;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.datatypes.PlayerProfile;
@ -52,9 +53,13 @@ public class mcEntityListener implements Listener
this.plugin = plugin;
}
@EventHandler(priority = EventPriority.MONITOR)
@EventHandler(priority = EventPriority.LOW)
public void onEntityDamage(EntityDamageEvent event)
{
//Pass around a fake event to see if any plugins cancel it
if(!m.EntityDamageEventSimulate(event.getEntity(), event.getCause(), event.getDamage()))
return;
if(event.isCancelled())
return;

15
src/main/java/com/gmail/nossr50/m.java
View File

@ -26,8 +26,10 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.*;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.*;
import com.gmail.nossr50.datatypes.FakeEntityDamageEvent;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.FakeBlockBreakEvent;
import com.gmail.nossr50.datatypes.SkillType;
@ -144,6 +146,19 @@ public class m
return false; //Return false if something went wrong
}
}
public static boolean EntityDamageEventSimulate(Entity damagee, DamageCause cause, int damage)
{
FakeEntityDamageEvent event = new FakeEntityDamageEvent(damagee, cause, damage);
Bukkit.getServer().getPluginManager().callEvent(event);
if(!event.isCancelled())
{
return true; //Return true if not cancelled
} else {
return false; //Return false if cancelled
}
}
public static void damageTool(Player player, short damage)
{