Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few I missed

Browse Source
This commit is contained in:
Olof Larsson 2013-04-18 11:11:18 +02:00
parent 9e6904b564
commit 8c00268015
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -154,11 +154,9 @@ public class FactionsEntityListener implements Listener
} }
// mainly for flaming arrows; don't want allies or people in safe zones to be ignited even after damage event is cancelled // mainly for flaming arrows; don't want allies or people in safe zones to be ignited even after damage event is cancelled
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityCombustByEntity(EntityCombustByEntityEvent event) public void onEntityCombustByEntity(EntityCombustByEntityEvent event)
{ {
if (event.isCancelled()) return;
EntityDamageByEntityEvent sub = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE, 0); EntityDamageByEntityEvent sub = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE, 0);
if ( ! this.canDamagerHurtDamagee(sub, false)) if ( ! this.canDamagerHurtDamagee(sub, false))
event.setCancelled(true); event.setCancelled(true);

8
src/com/massivecraft/factions/listeners/FactionsExploitListener.java
View File

@ -14,10 +14,10 @@ import com.massivecraft.factions.ConfServer;
public class FactionsExploitListener implements Listener public class FactionsExploitListener implements Listener
{ {
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void obsidianGenerator(BlockFromToEvent event) public void obsidianGenerator(BlockFromToEvent event)
{ {
if (event.isCancelled() == true || ! ConfServer.handleExploitObsidianGenerators) return; if (!ConfServer.handleExploitObsidianGenerators) return;
// thanks to ObGenBlocker and WorldGuard for this method // thanks to ObGenBlocker and WorldGuard for this method
Block block = event.getToBlock(); Block block = event.getToBlock();
@ -28,10 +28,10 @@ public class FactionsExploitListener implements Listener
} }
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void enderPearlTeleport(PlayerTeleportEvent event) public void enderPearlTeleport(PlayerTeleportEvent event)
{ {
if (event.isCancelled() == true || ! ConfServer.handleExploitEnderPearlClipping) return; if (!ConfServer.handleExploitEnderPearlClipping) return;
if (event.getCause() != PlayerTeleportEvent.TeleportCause.ENDER_PEARL) return; if (event.getCause() != PlayerTeleportEvent.TeleportCause.ENDER_PEARL) return;
// this exploit works when the target location is within 0.31 blocks or so of a door or glass block or similar... // this exploit works when the target location is within 0.31 blocks or so of a door or glass block or similar...