mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 17:43:44 +01:00 
			
		
		
		
	Compare commits
	
		
			8 Commits
		
	
	
		
			feature/ba
			...
			fix-4306
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 0ff33aff3c | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 3d56937f14 | ||
|   | 0f1c2cb4e4 | ||
|   | 7b233c944a | ||
|   | d9537ee9df | ||
|   | 0de6887526 | ||
|   | a2e3274215 | ||
|   | b369683b9c | 
| @@ -779,7 +779,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|                 Iterator<Entity> iterator = entities.iterator(); | ||||
|                 while (iterator.hasNext()) { | ||||
|                     Entity entity = iterator.next(); | ||||
|                     if (PaperLib.isPaper() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|                     //noinspection ConstantValue - getEntitySpawnReason annotated as NotNull, but is not NotNull. lol. | ||||
|                     if (PaperLib.isPaper() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|                         continue; | ||||
|                     } | ||||
|                     // Fallback for Spigot not having Entity#getEntitySpawnReason | ||||
|   | ||||
| @@ -56,6 +56,7 @@ import org.bukkit.entity.Player; | ||||
| import org.bukkit.entity.Projectile; | ||||
| import org.bukkit.entity.TNTPrimed; | ||||
| import org.bukkit.entity.Vehicle; | ||||
| import org.bukkit.event.Cancellable; | ||||
| import org.bukkit.event.EventHandler; | ||||
| import org.bukkit.event.EventPriority; | ||||
| import org.bukkit.event.Listener; | ||||
| @@ -98,37 +99,25 @@ public class EntityEventListener implements Listener { | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST) | ||||
|     public void onEntityCombustByEntity(EntityCombustByEntityEvent event) { | ||||
|         EntityDamageByEntityEvent eventChange = | ||||
|                 new EntityDamageByEntityEvent( | ||||
|                         event.getCombuster(), | ||||
|                         event.getEntity(), | ||||
|                         EntityDamageEvent.DamageCause.FIRE_TICK, | ||||
|                         event.getDuration() | ||||
|                 ); | ||||
|         onEntityDamageByEntityEvent(eventChange); | ||||
|         if (eventChange.isCancelled()) { | ||||
|             event.setCancelled(true); | ||||
|         } | ||||
|         onEntityDamageByEntityCommon(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE_TICK, event); | ||||
|     } | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST) | ||||
|     public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) { | ||||
|         Entity damager = event.getDamager(); | ||||
|         onEntityDamageByEntityCommon(event.getDamager(), event.getEntity(), event.getCause(), event); | ||||
|     } | ||||
|  | ||||
|     private void onEntityDamageByEntityCommon( | ||||
|             final Entity damager, | ||||
|             final Entity victim, | ||||
|             final EntityDamageEvent.DamageCause cause, | ||||
|             final Cancellable event | ||||
|     ) { | ||||
|         Location location = BukkitUtil.adapt(damager.getLocation()); | ||||
|         if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) { | ||||
|             return; | ||||
|         } | ||||
|         Entity victim = event.getEntity(); | ||||
| /* | ||||
|         if (victim.getType().equals(EntityType.ITEM_FRAME)) { | ||||
|             Plot plot = BukkitUtil.getLocation(victim).getPlot(); | ||||
|             if (plot != null && !plot.isAdded(damager.getUniqueId())) { | ||||
|                 event.setCancelled(true); | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
| */ | ||||
|         if (!BukkitEntityUtil.entityDamage(damager, victim, event.getCause())) { | ||||
|         if (!BukkitEntityUtil.entityDamage(damager, victim, cause)) { | ||||
|             if (event.isCancelled()) { | ||||
|                 if (victim instanceof Ageable ageable) { | ||||
|                     if (ageable.getAge() == -24000) { | ||||
| @@ -163,13 +152,13 @@ public class EntityEventListener implements Listener { | ||||
|             } | ||||
|             case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", | ||||
|                     "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL", | ||||
|                     "DUPLICATION", "FROZEN", "SPELL", "DEFAULT" -> { | ||||
|                     "FROZEN", "SPELL", "DEFAULT" -> { | ||||
|                 if (!area.isMobSpawning()) { | ||||
|                     event.setCancelled(true); | ||||
|                     return; | ||||
|                 } | ||||
|             } | ||||
|             case "BREEDING" -> { | ||||
|             case "BREEDING", "DUPLICATION" -> { | ||||
|                 if (!area.isSpawnBreeding()) { | ||||
|                     event.setCancelled(true); | ||||
|                     return; | ||||
|   | ||||
| @@ -124,7 +124,8 @@ public class EntitySpawnListener implements Listener { | ||||
|             return; | ||||
|         } | ||||
|         if (PaperLib.isPaper()) { | ||||
|             if (area.isSpawnCustom() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|             //noinspection ConstantValue - getEntitySpawnReason annotated as NotNull, but is not NotNull. lol. | ||||
|             if (area.isSpawnCustom() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -20,7 +20,6 @@ package com.plotsquared.core.command; | ||||
|  | ||||
| import com.google.inject.Inject; | ||||
| import com.plotsquared.core.configuration.Settings; | ||||
| import com.plotsquared.core.configuration.caption.StaticCaption; | ||||
| import com.plotsquared.core.configuration.caption.TranslatableCaption; | ||||
| import com.plotsquared.core.permissions.Permission; | ||||
| import com.plotsquared.core.player.PlotPlayer; | ||||
| @@ -202,7 +201,6 @@ public class Download extends SubCommand { | ||||
|                                                     .tag("delete", Tag.preProcessParsed("Not available")) | ||||
|                                                     .build() | ||||
|                                     ); | ||||
|                                     player.sendMessage(StaticCaption.of(value.toString())); | ||||
|                                 } | ||||
|                             } | ||||
|                     )); | ||||
|   | ||||
| @@ -1455,7 +1455,7 @@ public abstract class PlotArea implements ComponentLike { | ||||
|     /** | ||||
|      * Get the maximum height that changes to plot components (wall filling, air, all etc.) may operate to | ||||
|      * | ||||
|      * @since TODO | ||||
|      * @since 7.3.4 | ||||
|      */ | ||||
|     public int getMaxComponentHeight() { | ||||
|         return this.maxBuildHeight; | ||||
| @@ -1464,7 +1464,7 @@ public abstract class PlotArea implements ComponentLike { | ||||
|     /** | ||||
|      * Get the minimum height that changes to plot components (wall filling, air, all etc.) may operate to | ||||
|      * | ||||
|      * @since TODO | ||||
|      * @since 7.3.4 | ||||
|      */ | ||||
|     public int getMinComponentHeight() { | ||||
|         return this.minBuildHeight; | ||||
|   | ||||
| @@ -22,7 +22,7 @@ plugins { | ||||
| } | ||||
|  | ||||
| group = "com.intellectualsites.plotsquared" | ||||
| version = "7.3.4-SNAPSHOT" | ||||
| version = "7.3.5-SNAPSHOT" | ||||
|  | ||||
| if (!File("$rootDir/.git").exists()) { | ||||
|     logger.lifecycle(""" | ||||
|   | ||||
| @@ -13,7 +13,7 @@ log4j = "2.19.0" | ||||
|  | ||||
| # Plugins | ||||
| worldedit = "7.2.18" | ||||
| fawe = "2.8.4" | ||||
| fawe = "2.9.0" | ||||
| placeholderapi = "2.11.5" | ||||
| luckperms = "5.4" | ||||
| essentialsx = "2.20.1" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user