Commit cb3f3b92 authored by ImmuState's avatar ImmuState Committed by Melledy
Browse files

Make sure energy drops are only processed for actual monsters.

parent b34ab5f8
...@@ -303,6 +303,13 @@ public class EnergyManager { ...@@ -303,6 +303,13 @@ public class EnergyManager {
} }
} }
public void handleMonsterEnergyDrop(EntityMonster monster, float hpBeforeDamage, float hpAfterDamage) { public void handleMonsterEnergyDrop(EntityMonster monster, float hpBeforeDamage, float hpAfterDamage) {
// Make sure this is actually a monster.
// Note that some wildlife also has that type, like boars or birds.
String type = monster.getMonsterData().getType();
if (!type.equals("MONSTER_ORDINARY") && !type.equals("MONSTER_BOSS")) {
return;
}
// Calculate the HP tresholds for before and after the damage was taken. // Calculate the HP tresholds for before and after the damage was taken.
float maxHp = monster.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP); float maxHp = monster.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
float thresholdBefore = hpBeforeDamage / maxHp; float thresholdBefore = hpBeforeDamage / maxHp;
......
...@@ -156,5 +156,30 @@ ...@@ -156,5 +156,30 @@
"dropId": 22003100, "dropId": 22003100,
"dropList": [ "dropList": [
] ]
},
{
"dropId": 22001000,
"dropList": [
]
},
{
"dropId": 22000100,
"dropList": [
]
},
{
"dropId": 22003000,
"dropList": [
]
},
{
"dropId": 22001100,
"dropList": [
]
},
{
"dropId": 22000000,
"dropList": [
]
} }
] ]
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment