Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2025-02-16 20:41:56 +01:00
Code Issues Projects Releases Wiki Activity

Cleaned up listeners, redstone works (but drops as items), made permission string matching cleaner/faster

Browse Source
This commit is contained in:
Garbage Mule 2011-08-30 22:48:28 +02:00
parent 6fa7f377cc
commit 0fd997e3e9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
MobArena.jar
View File

Binary file not shown.

3
src/com/garbagemule/MobArena/MABlockListener.java
View File

@ -4,7 +4,6 @@ import org.bukkit.event.block.BlockBurnEvent;
import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockListener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.block.BlockPlaceEvent;
public class MABlockListener extends BlockListener
@ -40,9 +39,11 @@ public class MABlockListener extends BlockListener
arena.eventListener.onBlockIgnite(event);
}
/*
public void onBlockPhysics(BlockPhysicsEvent event)
{
for (Arena arena : am.arenas)
arena.eventListener.onBlockPhysics(event);
}
*/
}

8
src/com/garbagemule/MobArena/MAListener.java
View File

@ -19,7 +19,6 @@ import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockBurnEvent;
import org.bukkit.event.block.BlockEvent;
import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityCombustEvent;
@ -44,7 +43,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.material.Attachable;
import org.bukkit.material.Bed;
import org.bukkit.material.Door;
import org.bukkit.material.MaterialData;
import org.bukkit.material.Redstone;
import com.garbagemule.MobArena.MAMessages.Msg;
@ -61,6 +59,7 @@ public class MAListener implements ArenaListener
this.plugin = plugin;
}
/*
public void onBlockPhysics(BlockPhysicsEvent event)
{
if (!arena.inRegion(event.getBlock().getLocation()) || arena.softRestore)
@ -70,6 +69,7 @@ public class MAListener implements ArenaListener
if (data instanceof Attachable || data instanceof Bed || data instanceof Door || data instanceof Redstone)
event.setCancelled(true);
}
*/
public void onBlockBreak(BlockBreakEvent event)
{
@ -270,7 +270,7 @@ public class MAListener implements ArenaListener
if (damager instanceof Player)
arena.playerKill((Player) damager);
event.getDrops().clear();
event.getDrops().clear();
arena.resetIdleTimer();
return;
}
@ -355,7 +355,7 @@ public class MAListener implements ArenaListener
// Subtract boss health, and reset actual entity health
arena.bossWave.subtractHealth(event.getDamage());
arena.bossWave.getEntity().setHealth(200);
arena.bossWave.getEntity().setHealth(100);
// Set damage to 1 for knockback and feedback
event.setDamage(1);

3
src/com/garbagemule/MobArena/MobArena.java
View File

@ -121,7 +121,6 @@ public class MobArena extends JavaPlugin// implements ArenaPlugin
pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.Highest, this);
pm.registerEvent(Event.Type.BLOCK_BURN, blockListener, Priority.Highest, this);
pm.registerEvent(Event.Type.BLOCK_PLACE, blockListener, Priority.Highest, this);
pm.registerEvent(Event.Type.BLOCK_PHYSICS, blockListener, Priority.Normal, this);
pm.registerEvent(Event.Type.BLOCK_IGNITE, blockListener, Priority.Highest, this);
pm.registerEvent(Event.Type.PLAYER_INTERACT, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Priority.Normal, this);
@ -153,7 +152,7 @@ public class MobArena extends JavaPlugin// implements ArenaPlugin
return p.hasPermission(s);
// Otherwise, only allow commands that aren't admin/setup commands.
return !s.matches("^.*\\.setup\\..*$") && !s.matches("^.*\\.admin\\..*$");
return !s.matches("^mobarena\\.setup\\..*$") && !s.matches("^mobarena\\.admin\\..*$");
}
// Console printing