This commit is contained in:
Daniel Saukel 2016-05-05 20:46:41 +02:00
parent cac3e3de39
commit 5699cc142b
3 changed files with 8 additions and 6 deletions

View File

@ -67,7 +67,7 @@ Instead of referencing the internals of the implementation directly, DungeonsXL
The shaded version of DXL (standard version) contains this library, while the original version needs it as an external plugin. The shaded version of DXL (standard version) contains this library, while the original version needs it as an external plugin.
Have a look at the [installation instructions](../../wiki/getting-started#installation) for detailed information. Have a look at the [installation instructions](../../wiki/getting-started#installation) for detailed information.
DungeonsXL currently uses BRCommons 0.5. DungeonsXL currently uses BRCommons 0.5.1.
### Java ### Java
7 and higher 7 and higher

View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.11-SNAPSHOT</version> <version>0.11</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>DungeonsXL</name> <name>DungeonsXL</name>
<url>https://dre2n.github.io</url> <url>https://dre2n.github.io</url>

View File

@ -38,7 +38,6 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; 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.CreatureSpawnEvent.SpawnReason;
import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
@ -71,9 +70,12 @@ public class EntityListener implements Listener {
GameWorld gameWorld = GameWorld.getByWorld(world); GameWorld gameWorld = GameWorld.getByWorld(world);
if (editWorld != null || gameWorld != null) { if (editWorld != null || gameWorld != null) {
if (event.getSpawnReason() == SpawnReason.CHUNK_GEN || event.getSpawnReason() == SpawnReason.BREEDING || event.getSpawnReason() == SpawnReason.NATURAL switch (event.getSpawnReason()) {
|| event.getSpawnReason() == SpawnReason.DEFAULT) { case CHUNK_GEN:
event.setCancelled(true); case JOCKEY:
case MOUNT:
case NATURAL:
event.setCancelled(true);
} }
} }
} }