mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-27 07:33:43 +01:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			fix/v6/com
			...
			fix/3725
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 10d140b33c | ||
|   | 98ee2d162b | ||
|   | 62fac61c4d | 
| @@ -126,16 +126,16 @@ public class EntitySpawnListener implements Listener { | |||||||
|         Plot plot = location.getOwnedPlotAbs(); |         Plot plot = location.getOwnedPlotAbs(); | ||||||
|         EntityType type = entity.getType(); |         EntityType type = entity.getType(); | ||||||
|         if (plot == null) { |         if (plot == null) { | ||||||
|  |             if (type == EntityType.DROPPED_ITEM) { | ||||||
|  |                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { | ||||||
|  |                     event.setCancelled(true); | ||||||
|  |                 } | ||||||
|  |                 return; | ||||||
|  |             } | ||||||
|             if (!area.isMobSpawning()) { |             if (!area.isMobSpawning()) { | ||||||
|                 if (type == EntityType.PLAYER) { |                 if (type == EntityType.PLAYER) { | ||||||
|                     return; |                     return; | ||||||
|                 } |                 } | ||||||
|                 if (type == EntityType.DROPPED_ITEM) { |  | ||||||
|                     if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { |  | ||||||
|                         event.setCancelled(true); |  | ||||||
|                     } |  | ||||||
|                     return; |  | ||||||
|                 } |  | ||||||
|                 if (type.isAlive()) { |                 if (type.isAlive()) { | ||||||
|                     event.setCancelled(true); |                     event.setCancelled(true); | ||||||
|                 } |                 } | ||||||
|   | |||||||
| @@ -229,17 +229,17 @@ public class PaperListener implements Listener { | |||||||
|         Plot plot = location.getOwnedPlotAbs(); |         Plot plot = location.getOwnedPlotAbs(); | ||||||
|         if (plot == null) { |         if (plot == null) { | ||||||
|             EntityType type = event.getType(); |             EntityType type = event.getType(); | ||||||
|  |             // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency | ||||||
|  |             if (type == EntityType.DROPPED_ITEM) { | ||||||
|  |                 if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { | ||||||
|  |                     event.setCancelled(true); | ||||||
|  |                 } | ||||||
|  |                 return; | ||||||
|  |             } | ||||||
|             if (!area.isMobSpawning()) { |             if (!area.isMobSpawning()) { | ||||||
|                 if (type == EntityType.PLAYER) { |                 if (type == EntityType.PLAYER) { | ||||||
|                     return; |                     return; | ||||||
|                 } |                 } | ||||||
|                 if (type == EntityType.DROPPED_ITEM) { |  | ||||||
|                     if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { |  | ||||||
|                         event.setShouldAbortSpawn(true); |  | ||||||
|                         event.setCancelled(true); |  | ||||||
|                     } |  | ||||||
|                     return; |  | ||||||
|                 } |  | ||||||
|                 if (type.isAlive()) { |                 if (type.isAlive()) { | ||||||
|                     event.setShouldAbortSpawn(true); |                     event.setShouldAbortSpawn(true); | ||||||
|                     event.setCancelled(true); |                     event.setCancelled(true); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user