EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Bring v5 entity spawn changes to v6

Browse Source
This commit is contained in:
dordsor21 2021-01-06 21:56:26 +00:00
parent ec8bdc9af6
commit 98e8476a88
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
View File

@ -131,21 +131,24 @@ public class EntitySpawnListener implements Listener {
} }
Plot plot = location.getOwnedPlotAbs(); Plot plot = location.getOwnedPlotAbs();
if (plot == null) { if (plot == null) {
EntityType type = entity.getType();
if (!area.isMobSpawning()) { if (!area.isMobSpawning()) {
EntityType type = entity.getType();
switch (type) { switch (type) {
case DROPPED_ITEM: case DROPPED_ITEM:
if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
event.setCancelled(true); event.setCancelled(true);
break; return;
} }
case PLAYER: case PLAYER:
return; return;
} }
if (type.isAlive() || !area.isMiscSpawnUnowned()) { if (type.isAlive()) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
if (!area.isMiscSpawnUnowned() && !type.isAlive()) {
event.setCancelled(true);
}
return; return;
} }
if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {