update to MythicMobs 4.9.0

DenizenScript · Mar 21, 2020 · 27d316e · 27d316e
1 parent c1db759
commit 27d316e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/lib/MythicMobs.jar b/lib/MythicMobs.jar
diff --git a/pom.xml b/pom.xml
@@ -188,7 +188,7 @@
         <dependency>
             <groupId>io.lumine.xikage</groupId>
             <artifactId>mythicmobs</artifactId>
-            <version>4.7.0</version>
+            <version>4.9.0</version>
             <scope>system</scope>
             <systemPath>${basedir}/lib/MythicMobs.jar</systemPath>
         </dependency>

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MythicMobsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MythicMobsBridge.java
@@ -80,6 +80,6 @@ public static MythicMob getMythicMob(String name) {
     }
 
     public static Entity spawnMythicMob(MythicMob mythicMob, Location location, int level) {
-        return mythicMob.spawn(BukkitAdapter.adapt(location), level).getLivingEntity();
+        return mythicMob.spawn(BukkitAdapter.adapt(location), level).getEntity().getBukkitEntity();
     }
 }
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java
@@ -40,12 +40,8 @@ public class MythicMobsDeathEvent extends BukkitScriptEvent implements Listener
     // <context.killer> returns the EntityTag that killed the MythicMob (if available).
     // <context.level> Returns the level of the MythicMob.
     // <context.drops> Returns a list of items dropped.
-    // <context.xp> Returns the xp dropped.
-    // <context.currency> returns the currency dropped.
     //
     // @Determine
-    // "XP:" + ElementTag(Number) to specify the new amount of XP to be dropped.
-    // "CURRENCY:" + ElementTag(Decimal) to specify the new amount of currency to be dropped.
     // ListTag(ItemTag) to specify new items to be dropped.
     //
     // @Plugin Depenizen, MythicMobs
@@ -107,17 +103,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
         if (isDefaultDetermination(determinationObj)) {
             String determination = determinationObj.toString();
             Argument arg = new Argument(determination);
-            if (arg.matchesPrefix("currency") && arg.matchesFloat()) {
-                currency = new ElementTag(determination);
-                event.setCurrency(currency.asDouble());
-                return true;
-            }
-            else if (ArgumentHelper.matchesInteger(determination)) { // "xp" prefix, but not required for back support reasons.
-                experience = new ElementTag(determination);
-                event.setExp(experience.asInt());
-                return true;
-            }
-            else if (Argument.valueOf(determination).matchesArgumentList(ItemTag.class)) {
+            if (Argument.valueOf(determination).matchesArgumentList(ItemTag.class)) {
                 if (newDrops == null) {
                     newDrops = new ArrayList<>();
                 }
@@ -176,8 +162,6 @@ public void onMythicMobDeath(MythicMobDeathEvent event) {
         EntityTag.rememberEntity(entity.getBukkitEntity());
         killer = new EntityTag(event.getKiller());
         level = new ElementTag(event.getMobLevel());
-        experience = new ElementTag(event.getExp());
-        currency = new ElementTag(event.getCurrency());
         newDrops = null;
         this.event = event;
         fire(event);

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/mythicmobs/MythicMobsMobTag.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/mythicmobs/MythicMobsMobTag.java
@@ -78,7 +78,7 @@ public MythicMob getMobType() {
     }
 
     public LivingEntity getLivingEntity() {
-        return mob.getLivingEntity();
+        return (LivingEntity) mob.getEntity().getBukkitEntity();
     }
 
     public Entity getEntity() {