Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-17 21:02:12 +01:00
Code Issues Projects Releases Wiki Activity

Don't clear drops of custom mobs; resolves #75

Browse Source
This commit is contained in:
Daniel Saukel 2016-05-31 18:53:02 +02:00
parent a97b345b30
commit 758a9f03cd
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java
View File

@ -88,7 +88,6 @@ public class EntityListener implements Listener {
if (gameWorld.isPlaying()) {
DMob dMob = DMob.getByEntity(entity);
if (dMob != null) {
event.getDrops().clear();
dMob.onDeath(event);
}
}

38
src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java
View File

@ -48,13 +48,12 @@ public class DMob {
this.type = type;
/* Remove DropChance of equipment */
try {
if (!isExternalMob()) {
this.entity.getEquipment().setHelmetDropChance(0);
this.entity.getEquipment().setChestplateDropChance(0);
this.entity.getEquipment().setLeggingsDropChance(0);
this.entity.getEquipment().setBootsDropChance(0);
this.entity.getEquipment().setItemInHandDropChance(0);
} catch (UnsupportedOperationException exception) {
}
DMobSpawnEvent event = new DMobSpawnEvent(this, entity);
@ -70,6 +69,36 @@ public class DMob {
this.trigger = trigger;
}
/* Getters */
/**
* @return the represented LivingEntity
*/
public LivingEntity getEntity() {
return entity;
}
/**
* @return the DMobType or null if the mob is an external mob
*/
public DMobType getType() {
return type;
}
/**
* @return if the mob is spawned by an external plugin
*/
public boolean isExternalMob() {
return type == null;
}
/**
* @return the trigger String
*/
public String getTrigger() {
return trigger;
}
/* Actions */
public void onDeath(EntityDeathEvent event) {
LivingEntity victim = event.getEntity();
GameWorld gameWorld = GameWorld.getByWorld(victim.getWorld());
@ -87,6 +116,8 @@ public class DMob {
}
if (type != null) {
event.getDrops().clear();
for (ItemStack itemStack : type.getDrops().keySet()) {
Random randomGenerator = new Random();
int random = randomGenerator.nextInt(100);
@ -95,9 +126,10 @@ public class DMob {
event.getDrops().add(itemStack);
}
}
name = type.getName();
} else if (type == null && trigger != null) {// <=MythicMobs mob
} else if (isExternalMob() && trigger != null) {
name = trigger;
} else {