bug fix

toxicity188 · Nov 21, 2023 · d18de86 · d18de86
1 parent 48dfeda
commit d18de86
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/plugin/src/main/java/kor/toxicity/questadder/util/database/StandardDatabaseSupplier.kt b/plugin/src/main/java/kor/toxicity/questadder/util/database/StandardDatabaseSupplier.kt
@@ -28,7 +28,9 @@ enum class StandardDatabaseSupplier: DatabaseSupplier {
                     mkdir()
                 },"users").apply {
                     mkdir()
-                },"${player.uniqueId}.yml")
+                },"${player.uniqueId}.yml").apply {
+                    if (!exists()) createNewFile()
+                }
 
                 override fun close() {
                 }

diff --git a/plugin/src/main/java/kor/toxicity/questadder/util/event/mythicmobs/EventMythicDamage.java b/plugin/src/main/java/kor/toxicity/questadder/util/event/mythicmobs/EventMythicDamage.java
@@ -1,6 +1,7 @@
 package kor.toxicity.questadder.util.event.mythicmobs;
 
 import io.lumine.mythic.bukkit.events.MythicDamageEvent;
+import io.lumine.mythic.core.mobs.ActiveMob;
 import kor.toxicity.questadder.api.QuestAdder;
 import kor.toxicity.questadder.api.mechanic.AbstractAction;
 import kor.toxicity.questadder.api.mechanic.AbstractEvent;
@@ -13,14 +14,18 @@ public class EventMythicDamage extends AbstractEvent<MythicDamageEvent> {
 
     @DataField(aliases = "t")
     public EntityType type;
+    @DataField(aliases = "i")
+    public String id;
 
     public EventMythicDamage(QuestAdder adder, AbstractAction action) {
         super(adder, action, MythicDamageEvent.class);
     }
 
     @Override
     public void invoke(@NotNull MythicDamageEvent event) {
-        if (type != null && event.getDamageMetadata().getDamager().getEntity().getBukkitEntity().getType() != type) return;
+        var caster = event.getCaster();
+        if (type != null && caster.getEntity().getBukkitEntity().getType() != type) return;
+        if (id != null && caster instanceof ActiveMob mob && !mob.getMobType().equals(id)) return;
         if (event.getCaster().getEntity().getBukkitEntity() instanceof Player player) apply(player);
     }
 }
diff --git a/plugin/src/main/java/kor/toxicity/questadder/util/reflect/ActionReflector.java b/plugin/src/main/java/kor/toxicity/questadder/util/reflect/ActionReflector.java
@@ -17,7 +17,7 @@
 import java.util.Map;
 import java.util.function.Function;
 
-public class ActionReflector<T extends DataObject> {
+public final class ActionReflector<T extends DataObject> {
 
     private final T object;