From 557b0bf978b98abbdd8142c739410470c1d111e1 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 11 Mar 2016 01:55:49 +1300 Subject: [PATCH] Fix Wither disguise --- .../mineplex/core/disguise/disguises/DisguiseWither.java | 3 +++ .../nautilus/game/arcade/game/games/rings/ElytraRings.java | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseWither.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseWither.java index 884123ee8..333d283bd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseWither.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseWither.java @@ -5,6 +5,8 @@ import net.minecraft.server.v1_8_R3.EntityWither; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; +import mineplex.core.common.util.UtilMath; + public class DisguiseWither extends DisguiseMonster { public DisguiseWither(org.bukkit.entity.Entity entity) @@ -24,6 +26,7 @@ public class DisguiseWither extends DisguiseMonster public void setInvulTime(int i) { + DataWatcher.watch(17, Integer.valueOf(i), EntityWither.META_INVUL_TIME, i); DataWatcher.watch(20, Integer.valueOf(i), EntityWither.META_INVUL_TIME, i); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/rings/ElytraRings.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/rings/ElytraRings.java index 00920d3c2..127c8aa16 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/rings/ElytraRings.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/rings/ElytraRings.java @@ -19,6 +19,7 @@ import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ViewDist; @@ -43,7 +44,7 @@ public class ElytraRings extends SoloGame { super(manager, GameType.ElytraRings, new Kit[] { - new KitUHC(manager) + new KitElytraRings(manager) }, new String[] { "Fly through the rings!" @@ -175,7 +176,7 @@ public class ElytraRings extends SoloGame if (exp > 0.05 && _lastLocation.containsKey(player.getUniqueId())) { - UtilAction.velocity(player, player.getLocation().getDirection()); + UtilAction.velocity(player, player.getLocation().getDirection().multiply(0.3)); if (!_goneThrough.containsKey(player.getUniqueId()) || _rings.containsKey(_goneThrough.get(player.getUniqueId()) + 1)) @@ -206,7 +207,7 @@ public class ElytraRings extends SoloGame Player player = event.getPlayer(); - if (event.isSneaking()) + if (event.isSneaking() && UtilPlayer.isGliding(player)) { _lastLocation.put(player.getUniqueId(), player.getLocation()); }