Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 12:46:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #494 from cmastudios/patch-3

Browse Source 
Allow players in the same faction to PVP. Thanks @cmastudios!
This commit is contained in:
taoneill 2012-06-21 20:06:50 -07:00
commit 9139f9df45
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
war/src/main/java/com/tommytony/war/event/WarEntityListener.java
View File

@ -16,6 +16,7 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
@ -48,7 +49,7 @@ import com.tommytony.war.utility.LoadoutSelection;
* Handles Entity-Events * Handles Entity-Events
* *
* @author tommytony, Tim Düsterhus * @author tommytony, Tim Düsterhus
* @package bukkit.tommytony.war * @package com.tommytony.war.event
*/ */
public class WarEntityListener implements Listener { public class WarEntityListener implements Listener {
@ -404,7 +405,7 @@ public class WarEntityListener implements Listener {
* *
* @see EntityListener.onEntityDamage() * @see EntityListener.onEntityDamage()
*/ */
@EventHandler @EventHandler(priority = EventPriority.HIGHEST)
public void onEntityDamage(final EntityDamageEvent event) { public void onEntityDamage(final EntityDamageEvent event) {
if (!War.war.isLoaded()) { if (!War.war.isLoaded()) {
return; return;