fix: exception from crystal damager

Closes #9
mcpvp-club · Feb 16, 2024 · 5ae078b · 5ae078b
1 parent 9d4543f
commit 5ae078b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 32 deletions.
diff --git a/v1_19_4/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_19_R3.java b/v1_19_4/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_19_R3.java
@@ -1,8 +1,7 @@
 package xyz.reknown.fastercrystals.damager;
 
-import net.minecraft.core.Holder;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSources;
 import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEnderCrystal;
 import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
@@ -12,10 +11,8 @@
 public class CrystalDamager_1_19_R3 implements ICrystalDamager {
     @Override
     public void damage(Entity entity, Player player) {
-        ((CraftEnderCrystal) entity).getHandle().hurt(new DamageSource(
-                        Holder.direct(new DamageType("player", 0.1f)),
-                        ((CraftPlayer) player).getHandle()),
-                1
-        );
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        DamageSources damageSources = serverPlayer.level.damageSources();
+        ((CraftEnderCrystal) entity).getHandle().hurt(damageSources.playerAttack(serverPlayer), 1);
     }
 }
diff --git a/v1_20/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_20_R1.java b/v1_20/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_20_R1.java
@@ -1,8 +1,7 @@
 package xyz.reknown.fastercrystals.damager;
 
-import net.minecraft.core.Holder;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSources;
 import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEnderCrystal;
 import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
@@ -12,10 +11,8 @@
 public class CrystalDamager_1_20_R1 implements ICrystalDamager {
     @Override
     public void damage(Entity entity, Player player) {
-        ((CraftEnderCrystal) entity).getHandle().hurt(new DamageSource(
-                        Holder.direct(new DamageType("player", 0.1f)),
-                        ((CraftPlayer) player).getHandle()),
-                1
-        );
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        DamageSources damageSources = serverPlayer.level().damageSources();
+        ((CraftEnderCrystal) entity).getHandle().hurt(damageSources.playerAttack(serverPlayer), 1);
     }
 }
diff --git a/v1_20_2/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_20_R2.java b/v1_20_2/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_20_R2.java
@@ -1,8 +1,7 @@
 package xyz.reknown.fastercrystals.damager;
 
-import net.minecraft.core.Holder;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSources;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEnderCrystal;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
@@ -12,10 +11,8 @@
 public class CrystalDamager_1_20_R2 implements ICrystalDamager {
     @Override
     public void damage(Entity entity, Player player) {
-        ((CraftEnderCrystal) entity).getHandle().hurt(new DamageSource(
-                        Holder.direct(new DamageType("player", 0.1f)),
-                        ((CraftPlayer) player).getHandle()),
-                1
-        );
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        DamageSources damageSources = serverPlayer.level().damageSources();
+        ((CraftEnderCrystal) entity).getHandle().hurt(damageSources.playerAttack(serverPlayer), 1);
     }
 }
diff --git a/v1_20_3/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_20_R3.java b/v1_20_3/src/main/java/xyz/reknown/fastercrystals/damager/CrystalDamager_1_20_R3.java
@@ -1,8 +1,7 @@
 package xyz.reknown.fastercrystals.damager;
 
-import net.minecraft.core.Holder;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSources;
 import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEnderCrystal;
 import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
@@ -12,10 +11,8 @@
 public class CrystalDamager_1_20_R3 implements ICrystalDamager {
     @Override
     public void damage(Entity entity, Player player) {
-        ((CraftEnderCrystal) entity).getHandle().hurt(new DamageSource(
-                        Holder.direct(new DamageType("player", 0.1f)),
-                        ((CraftPlayer) player).getHandle()),
-                1
-        );
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        DamageSources damageSources = serverPlayer.level().damageSources();
+        ((CraftEnderCrystal) entity).getHandle().hurt(damageSources.playerAttack(serverPlayer), 1);
     }
 }