Consider the summon command as plugin spawning

EngineHub · May 31, 2023 · 4a26e30 · 4a26e30
1 parent 44d0735
commit 4a26e30
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java b/...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java
@@ -603,7 +603,7 @@ public void onCreatureSpawn(CreatureSpawnEvent event) {
         WorldConfiguration wcfg = getWorldConfig(event.getEntity().getWorld());
 
         // allow spawning of creatures from plugins
-        if (!wcfg.blockPluginSpawning && event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.CUSTOM) {
+        if (!wcfg.blockPluginSpawning && Entities.isPluginSpawning(event.getSpawnReason())) {
             return;
         }
 

diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java
@@ -44,6 +44,7 @@
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.entity.minecart.ExplosiveMinecart;
+import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.projectiles.ProjectileSource;
 
@@ -230,4 +231,18 @@ public static boolean isPotionArrow(Entity entity) {
     public static boolean isAoECloud(EntityType type) {
         return type == EntityType.AREA_EFFECT_CLOUD;
     }
+
+    /**
+     * Check whether the spawn reason should be considered as a "plugin spawning".
+     * This is true for custom creations or the summon command.
+     *
+     * @param spawnReason the reason
+     * @return true if considerd plugin spawning
+     */
+    public static boolean isPluginSpawning(CreatureSpawnEvent.SpawnReason spawnReason) {
+        return switch (spawnReason) {
+            case CUSTOM, COMMAND -> true;
+            default -> false;
+        };
+    }
 }