Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix external mob m triggers

This commit is contained in:
Daniel Saukel 2021-10-24 17:14:31 +02:00
parent 9a0657bc29
commit 961906d4d6
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/main/java/de/erethon/dungeonsxl/api/mob/DungeonMob.java
View File

@ -38,15 +38,6 @@ public interface DungeonMob {
*/ */
ExMob getType(); ExMob getType();
/**
* Returns if the mob is spawned by an external plugin.
*
* @return if the mob is spawned by an external plugin
*/
default boolean isExternalMob() {
return getType() == null;
}
/** /**
* Returns the String used to identify this mob for example in the context of triggers. * Returns the String used to identify this mob for example in the context of triggers.
* *

2
core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java
View File

@ -693,7 +693,7 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
if (mob != null) { if (mob != null) {
return mob; return mob;
} else { } else {
return new DMob(entity, gameWorld, type); return new DMob(entity, gameWorld, type, type.getId());
} }
} }

21
core/src/main/java/de/erethon/dungeonsxl/mob/DMob.java
View File

@ -17,7 +17,6 @@
package de.erethon.dungeonsxl.mob; package de.erethon.dungeonsxl.mob;
import de.erethon.caliburn.mob.ExMob; import de.erethon.caliburn.mob.ExMob;
import de.erethon.caliburn.mob.VanillaMob;
import de.erethon.dungeonsxl.DungeonsXL; import de.erethon.dungeonsxl.DungeonsXL;
import de.erethon.dungeonsxl.api.dungeon.GameRule; import de.erethon.dungeonsxl.api.dungeon.GameRule;
import de.erethon.dungeonsxl.api.event.mob.DungeonMobDeathEvent; import de.erethon.dungeonsxl.api.event.mob.DungeonMobDeathEvent;
@ -44,7 +43,7 @@ public class DMob implements DungeonMob {
private String trigger; private String trigger;
public DMob(LivingEntity entity, GameWorld gameWorld, ExMob type) { public DMob(LivingEntity entity, GameWorld gameWorld, ExMob type, String trigger) {
this.entity = entity; this.entity = entity;
this.type = type; this.type = type;
@ -60,16 +59,11 @@ public class DMob implements DungeonMob {
entity.getEquipment().setItemInHandDropChance(0); entity.getEquipment().setItemInHandDropChance(0);
} }
} }
gameWorld.addMob(this);
DungeonMobSpawnEvent event = new DungeonMobSpawnEvent(this); DungeonMobSpawnEvent event = new DungeonMobSpawnEvent(this);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
this.trigger = type.getId();
}
public DMob(LivingEntity entity, GameWorld gameWorld, ExMob type, String trigger) {
this(entity, gameWorld, type);
this.trigger = trigger; this.trigger = trigger;
gameWorld.addMob(this);
} }
/* Getters */ /* Getters */
@ -109,16 +103,7 @@ public class DMob implements DungeonMob {
event.setDroppedExp(0); event.setDroppedExp(0);
} }
String name; MobTrigger mobTrigger = MobTrigger.getByName(trigger, gameWorld);
if (!isExternalMob()) {
name = type.getId();
} else if (isExternalMob() && trigger != null) {
name = trigger;
} else {
name = VanillaMob.get(victim.getType()).getId();
}
MobTrigger mobTrigger = MobTrigger.getByName(name, gameWorld);
if (mobTrigger != null) { if (mobTrigger != null) {
mobTrigger.onTrigger(); mobTrigger.onTrigger();
} }