EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove monster targeting cancellation. It is interpreted as a bug by some and is not expected behavior.

Browse Source
This commit is contained in:
Olof Larsson
2015-03-23 09:11:53 +01:00
parent c65da10b52
commit 26dd2f7cbd
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/massivecraft/factions/engine/EngineMain.java
View File

@@ -44,7 +44,6 @@ import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.PotionSplashEvent; import org.bukkit.event.entity.PotionSplashEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -1151,32 +1150,6 @@ public class EngineMain extends EngineAbstract
event.setCancelled(true); event.setCancelled(true);
} }
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void blockMonsters(EntityTargetEvent event)
{
// If a monster ...
if ( ! MConf.get().entityTypesMonsters.contains(event.getEntityType())) return;
// ... is targeting something ...
Entity target = event.getTarget();
if (target == null) return;
// ... at a place where monsters are forbidden ...
PS ps = PS.valueOf(target.getLocation());
Faction faction = BoardColl.get().getFactionAt(ps);
if (faction.getFlag(MFlag.getFlagMonsters())) return;
// ... then if ghast target nothing ...
if (event.getEntityType() == EntityType.GHAST)
{
event.setTarget(null);
return;
}
// ... otherwise simply cancel.
event.setCancelled(true);
}
// -------------------------------------------- // // -------------------------------------------- //
// FLAG: EXPLOSIONS // FLAG: EXPLOSIONS
// -------------------------------------------- // // -------------------------------------------- //