Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-10-03 00:57:34 +02:00
Code Issues Projects Releases Wiki Activity

Fixed bad merge.

Browse Source
This commit is contained in:
sk89q 2011-03-08 10:06:40 -08:00
parent 81eb2cad1a
commit 7fab4144ae
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -319,14 +319,10 @@ public void onCreatureSpawn(CreatureSpawnEvent event) {
GlobalConfiguration cfg = plugin.getGlobalConfiguration();
WorldConfiguration wcfg = cfg.getWorldConfig(event.getEntity().getWorld().getName());
<<<<<<< HEAD
//CreatureType creaType = (CreatureType) CreatureType.valueOf(event.getMobType().toString());
CreatureType creaType = event.getCreatureType();
String creaName = "";
=======
CreatureType creaType = (CreatureType) CreatureType.valueOf(event.getMobType().toString());
>>>>>>> ebdb727... Some initial code reorganization. Todo: Have CSVDatabase handle flags so they can be ported over, and do the commands system a cleaner way.
String creaName = "";
Boolean cancelEvent = false;
if (wcfg.blockCreatureSpawn.contains(creaType)) {