From 04cb0fb0b06de8b8e5adf9c6d8d1202ca40061ca Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Tue, 28 Jun 2016 23:09:52 +0300 Subject: [PATCH] Use updated ProjectileUser method names --- .../arcade/game/games/mineware/BawkBawkBattles.java | 2 +- .../mineware/challenge/type/ChallengeAnvilDance.java | 2 +- .../mineware/challenge/type/ChallengeBlockLobbers.java | 10 +++++----- .../challenge/type/ChallengeFallingBlocks.java | 2 +- .../mineware/challenge/type/ChallengeWaveCrush.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index 1f4730b64..9e7c33c1b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -1771,7 +1771,7 @@ public class BawkBawkBattles extends TeamGame implements IThrown } } - if (data.GetThrown() instanceof Chicken) + if (data.getThrown() instanceof Chicken) { if (target instanceof Player) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeAnvilDance.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeAnvilDance.java index 13ca38b25..ce8b4023f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeAnvilDance.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeAnvilDance.java @@ -342,7 +342,7 @@ public class ChallengeAnvilDance extends Challenge @Override public void onCollide(LivingEntity target, Block block, ProjectileUser data) { - if (target instanceof Player && data.GetThrown() instanceof FallingBlock) + if (target instanceof Player && data.getThrown() instanceof FallingBlock) { Player player = (Player) target; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBlockLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBlockLobbers.java index 6eec9b098..6fef7c2b6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBlockLobbers.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBlockLobbers.java @@ -186,10 +186,10 @@ public class ChallengeBlockLobbers extends Challenge @Override public void onCollide(LivingEntity target, Block block, ProjectileUser data) { - if (!(data.GetThrown() instanceof FallingBlock)) + if (!(data.getThrown() instanceof FallingBlock)) return; - if (!(data.GetThrower() instanceof Player)) + if (!(data.getThrower() instanceof Player)) return; if (!(target instanceof Player)) @@ -198,11 +198,11 @@ public class ChallengeBlockLobbers extends Challenge if (!isPlayerValid((Player) target)) return; - if (target.equals(data.GetThrower())) + if (target.equals(data.getThrower())) return; - UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.GetThrown().getLocation(), target.getLocation()), 0.8, false, 0, 0.3, 0.5, true); - data.GetThrown().remove(); + UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.getThrown().getLocation(), target.getLocation()), 0.8, false, 0, 0.3, 0.5, true); + data.getThrown().remove(); } public void switchToAvailableSlot(Player player) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java index 4fff61e7a..d21790141 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java @@ -366,7 +366,7 @@ public class ChallengeFallingBlocks extends Challenge implements NumberTracker @Override public void onCollide(LivingEntity target, Block block, ProjectileUser data) { - if (target instanceof Player && data.GetThrown() instanceof FallingBlock) + if (target instanceof Player && data.getThrown() instanceof FallingBlock) { Player player = (Player) target; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java index 36ced1797..56c34ba7c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java @@ -155,7 +155,7 @@ public class ChallengeWaveCrush extends Challenge implements NumberTracker @Override public void onCollide(LivingEntity target, Block block, ProjectileUser data) { - if (target instanceof Player && data.GetThrown() instanceof FallingBlock) + if (target instanceof Player && data.getThrown() instanceof FallingBlock) { Player player = (Player) target;