fix: check for AbstractWindCharge to handle Breeze, too

timbru31 · Feb 6, 2025 · 4b28c80 · 4b28c80
1 parent ce3c0f6
commit 4b28c80
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/modules/v1_20_R4/src/main/java/de/dustplanet/silkspawners/compat/v1_20_R4/NMSHandler.java b/modules/v1_20_R4/src/main/java/de/dustplanet/silkspawners/compat/v1_20_R4/NMSHandler.java
@@ -28,8 +28,8 @@
 import org.bukkit.craftbukkit.v1_20_R4.block.CraftCreatureSpawner;
 import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemStack;
+import org.bukkit.entity.AbstractWindCharge;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.WindCharge;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -543,7 +543,7 @@ public Player loadPlayer(final OfflinePlayer offline) {
 
     @Override
     public boolean isWindCharge(final org.bukkit.entity.Entity entity) {
-        return entity instanceof WindCharge;
+        return entity instanceof AbstractWindCharge;
     }
 
 }
diff --git a/modules/v1_21_R1/src/main/java/de/dustplanet/silkspawners/compat/v1_21_R1/NMSHandler.java b/modules/v1_21_R1/src/main/java/de/dustplanet/silkspawners/compat/v1_21_R1/NMSHandler.java
@@ -28,8 +28,8 @@
 import org.bukkit.craftbukkit.v1_21_R1.block.CraftCreatureSpawner;
 import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
+import org.bukkit.entity.AbstractWindCharge;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.WindCharge;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -543,7 +543,7 @@ public Player loadPlayer(final OfflinePlayer offline) {
 
     @Override
     public boolean isWindCharge(final org.bukkit.entity.Entity entity) {
-        return entity instanceof WindCharge;
+        return entity instanceof AbstractWindCharge;
     }
 
 }
diff --git a/modules/v1_21_R2/src/main/java/de/dustplanet/silkspawners/compat/v1_21_R2/NMSHandler.java b/modules/v1_21_R2/src/main/java/de/dustplanet/silkspawners/compat/v1_21_R2/NMSHandler.java
@@ -28,8 +28,8 @@
 import org.bukkit.craftbukkit.v1_21_R2.block.CraftCreatureSpawner;
 import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack;
+import org.bukkit.entity.AbstractWindCharge;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.WindCharge;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -551,7 +551,7 @@ public Player loadPlayer(final OfflinePlayer offline) {
 
     @Override
     public boolean isWindCharge(final org.bukkit.entity.Entity entity) {
-        return entity instanceof WindCharge;
+        return entity instanceof AbstractWindCharge;
     }
 
 }
diff --git a/modules/v1_21_R3/src/main/java/de/dustplanet/silkspawners/compat/v1_21_R3/NMSHandler.java b/modules/v1_21_R3/src/main/java/de/dustplanet/silkspawners/compat/v1_21_R3/NMSHandler.java
@@ -28,8 +28,8 @@
 import org.bukkit.craftbukkit.v1_21_R3.block.CraftCreatureSpawner;
 import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack;
+import org.bukkit.entity.AbstractWindCharge;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.WindCharge;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -551,7 +551,7 @@ public Player loadPlayer(final OfflinePlayer offline) {
 
     @Override
     public boolean isWindCharge(final org.bukkit.entity.Entity entity) {
-        return entity instanceof WindCharge;
+        return entity instanceof AbstractWindCharge;
     }
 
 }