JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the death message when using Summon Wolves

Browse Source
This commit is contained in:
Nate Mortensen 2016-11-21 13:35:08 -07:00 committed by cnr
parent 1425a2aaed
commit abbb46ec0a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java
View File

@ -487,8 +487,8 @@ public class CombatManager extends MiniPlugin
if (log.GetAssists() > 0) if (log.GetAssists() > 0)
killPlayer += " + " + log.GetAssists(); killPlayer += " + " + log.GetAssists();
String weapon = log.GetKiller().GetLastDamageSource(); String weapon = (String) log.GetKiller().GetDamage().getFirst().getMetadata().get("customWeapon");
weapon = weapon == null ? log.GetKiller().GetLastDamageSource() : weapon;
UtilPlayer.message( UtilPlayer.message(
cur, cur,
F.main("Death", F.main("Death",

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSummonWolves.java
View File

@ -86,6 +86,7 @@ public class SpellSummonWolves extends Spell implements SpellClick, SpellClickBl
if (tamer instanceof Player) if (tamer instanceof Player)
{ {
event.SetDamager((Player) tamer); event.SetDamager((Player) tamer);
event.setMetadata("customWeapon", "Summon Wolves");
event.setKnockbackOrigin(wolf.getLocation()); event.setKnockbackOrigin(wolf.getLocation());
} }
} }