Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-01-23 07:41:21 +01:00
Code Issues Projects Releases Wiki Activity

Uncancels damage event first (Disabling of /god)

Browse Source
This commit is contained in:
TimWolla 2011-07-10 18:21:12 +02:00
parent 6c0212d405
commit bd6d02ba76
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
war/src/main/java/bukkit/tommytony/war/War.java
View File

@ -143,7 +143,7 @@ public class War extends JavaPlugin {
pm.registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.Normal, this);
//pm.registerEvent(Event.Type.ENTITY_DEATH, entityListener, Priority.Normal, this); //pm.registerEvent(Event.Type.ENTITY_DEATH, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Priority.High, this);
pm.registerEvent(Event.Type.ENTITY_COMBUST, entityListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_COMBUST, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.CREATURE_SPAWN, entityListener, Priority.Normal, this); pm.registerEvent(Event.Type.CREATURE_SPAWN, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_REGAIN_HEALTH, entityListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_REGAIN_HEALTH, entityListener, Priority.Normal, this);

6
war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
View File

@ -165,12 +165,16 @@ public class WarEntityListener extends EntityListener {
public void onEntityDamage(EntityDamageEvent event) { public void onEntityDamage(EntityDamageEvent event) {
if(war.isLoaded()) { if(war.isLoaded()) {
Entity entity = event.getEntity();
if(entity instanceof Player && war.getPlayerTeamWarzone(((Player) entity).getName()) != null) {
event.setCancelled(false);
}
if(event instanceof EntityDamageByEntityEvent || if(event instanceof EntityDamageByEntityEvent ||
event instanceof EntityDamageByProjectileEvent) { event instanceof EntityDamageByProjectileEvent) {
handlerAttackDefend((EntityDamageByEntityEvent)event); handlerAttackDefend((EntityDamageByEntityEvent)event);
} else { } else {
// Detect death (from , prevent it and respawn the player // Detect death (from , prevent it and respawn the player
Entity entity = event.getEntity();
if(entity instanceof Player) { if(entity instanceof Player) {
Player player = (Player) entity; Player player = (Player) entity;
Warzone zone = war.getPlayerTeamWarzone(player.getName()); Warzone zone = war.getPlayerTeamWarzone(player.getName());