Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 13:36:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix DMob trigger ID usage

Browse Source
This commit is contained in:
Daniel Saukel 2018-10-27 17:59:11 +02:00
parent 7f206207e5
commit 1f4b6a6905
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@
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.caliburn.util.compatibility.Version;
import de.erethon.dungeonsxl.event.dmob.DMobDeathEvent; import de.erethon.dungeonsxl.event.dmob.DMobDeathEvent;
import de.erethon.dungeonsxl.event.dmob.DMobSpawnEvent; import de.erethon.dungeonsxl.event.dmob.DMobSpawnEvent;
import de.erethon.dungeonsxl.game.Game; import de.erethon.dungeonsxl.game.Game;
@ -42,7 +44,7 @@ public class DMob {
private String trigger; private String trigger;
public DMob(LivingEntity entity, DGameWorld gameWorld) { private DMob(LivingEntity entity, DGameWorld gameWorld) {
gameWorld.addDMob(this); gameWorld.addDMob(this);
this.entity = entity; this.entity = entity;
@ -54,6 +56,9 @@ public class DMob {
this.entity.getEquipment().setLeggingsDropChance(0); this.entity.getEquipment().setLeggingsDropChance(0);
this.entity.getEquipment().setBootsDropChance(0); this.entity.getEquipment().setBootsDropChance(0);
this.entity.getEquipment().setItemInHandDropChance(0); this.entity.getEquipment().setItemInHandDropChance(0);
if (Version.isAtLeast(Version.MC1_9)) {
this.entity.getEquipment().setItemInOffHandDropChance(0);
}
} }
DMobSpawnEvent event = new DMobSpawnEvent(this, entity); DMobSpawnEvent event = new DMobSpawnEvent(this, entity);
@ -72,10 +77,12 @@ public class DMob {
public DMob(LivingEntity entity, DGameWorld gameWorld, ExMob type) { public DMob(LivingEntity entity, DGameWorld gameWorld, ExMob type) {
this(entity, gameWorld); this(entity, gameWorld);
this.type = type; this.type = type;
this.trigger = type.getId();
} }
public DMob(LivingEntity entity, DGameWorld gameWorld, ExMob type, String trigger) { public DMob(LivingEntity entity, DGameWorld gameWorld, ExMob type, String trigger) {
this(entity, gameWorld, type); this(entity, gameWorld);
this.type = type;
this.trigger = trigger; this.trigger = trigger;
} }
@ -137,13 +144,13 @@ public class DMob {
} }
} }
name = type.getName(); name = type.getId();
} else if (isExternalMob() && trigger != null) { } else if (isExternalMob() && trigger != null) {
name = trigger; name = trigger;
} else { } else {
name = victim.getType().getName(); name = VanillaMob.get(victim.getType()).getId();
} }
MobTrigger mobTrigger = MobTrigger.getByName(name, gameWorld); MobTrigger mobTrigger = MobTrigger.getByName(name, gameWorld);