diff options
| author | BlackHole <black-hole@live.com> | 2016-03-05 20:58:48 +0100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-06 08:28:34 +1100 |
| commit | 45171f086413936099a2335ca32dbdc129cf640e (patch) | |
| tree | daf690e171a59655ba21be25f1078481511d026f /src | |
| parent | 73eff0d75dfa8c6dca768d6c447ef532d9500590 (diff) | |
| download | craftbukkit-45171f086413936099a2335ca32dbdc129cf640e.tar craftbukkit-45171f086413936099a2335ca32dbdc129cf640e.tar.gz craftbukkit-45171f086413936099a2335ca32dbdc129cf640e.tar.lz craftbukkit-45171f086413936099a2335ca32dbdc129cf640e.tar.xz craftbukkit-45171f086413936099a2335ca32dbdc129cf640e.zip | |
SPIGOT-1772: Use correct statistics for entities
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftStatistic.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java b/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java index 905cebe9..9b92cb6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java @@ -126,10 +126,15 @@ public class CraftStatistic { } public static net.minecraft.server.Statistic getEntityStatistic(org.bukkit.Statistic stat, EntityType entity) { - MonsterEggInfo monsteregginfo = (MonsterEggInfo) EntityTypes.eggInfo.get(Integer.valueOf(entity.getTypeId())); + MonsterEggInfo monsteregginfo = (MonsterEggInfo) EntityTypes.eggInfo.get(entity.getName()); if (monsteregginfo != null) { - return monsteregginfo.killEntityStatistic; + if (stat == org.bukkit.Statistic.KILL_ENTITY) { + return monsteregginfo.killEntityStatistic; + } + if (stat == org.bukkit.Statistic.ENTITY_KILLED_BY) { + return monsteregginfo.e; // PAIL: rename + } } return null; } |