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

Wizards: Melee with wands should say it was wands that did it

Browse Source
This commit is contained in:
libraryaddict 2015-05-04 04:09:49 +12:00
parent 08140f8863
commit 3fcec13e68
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/Wizards.java
View File

@ -35,7 +35,6 @@ import mineplex.core.packethandler.IPacketHandler;
import mineplex.core.packethandler.PacketInfo;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.combat.CombatManager.AttackReason;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import mineplex.minecraft.game.core.explosion.CustomExplosion;
import nautilus.game.arcade.ArcadeManager;
@ -178,7 +177,7 @@ public class Wizards extends SoloGame
}
Manager.getCosmeticManager().setHideParticles(true);
Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.DefaultWeaponName);
// Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.DefaultWeaponName);
createLoot();
@ -307,6 +306,31 @@ public class Wizards extends SoloGame
}
}
@EventHandler
public void onWandHit(CustomDamageEvent event)
{
// Damager is ENTITY
if (event.GetDamagerEntity(true) != null)
{
if (event.GetReason() == null)
{
if (event.GetDamagerPlayer(false) != null)
{
Player damager = event.GetDamagerPlayer(false);
if (damager.getInventory().getHeldItemSlot() < 5)
{
Wizard wizard = getWizard(damager);
String reason = damager.getInventory().getHeldItemSlot() < wizard.getWandsOwned() ? "Wand" : "Fist";
event.AddMod(reason, reason, 0, true);
}
}
}
}
}
@EventHandler
public void onDamage(CustomDamageEvent event)
{
@ -1587,7 +1611,7 @@ public class Wizards extends SoloGame
UtilPlayer.message(event.getViewers().get(0), C.cRed + "You may not craft weapons");
}
else if (mat == Material.STICK || mat.name().contains("_HOE"))
else if (mat == Material.STICK || mat == Material.BUCKET || mat.name().contains("_HOE"))
{
event.getInventory().setResult(new ItemStack(Material.AIR));