From 07f032a5d20cb75ceeefda424e9ab62f43134ecf Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 21 Oct 2015 04:22:31 +1300 Subject: [PATCH] Fix wither pet making sounds, fixed worldtime. --- .../mineplex/core/disguise/DisguiseManager.java | 7 +++---- .../src/mineplex/core/pet/PetManager.java | 14 ++++++++------ .../src/nautilus/game/arcade/ArcadeManager.java | 5 +++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java index 3d48a7779..4aa15af2c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java @@ -107,10 +107,9 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler PacketPlayOutEntityStatus.class, PacketPlayOutMapChunk.class, PacketPlayOutMapChunkBulk.class, PacketPlayOutNamedEntitySpawn.class, PacketPlayOutPlayerInfo.class, PacketPlayOutEntity.PacketPlayOutRelEntityMove.class, PacketPlayOutEntity.PacketPlayOutRelEntityMoveLook.class, - PacketPlayOutPlayerInfo.PlayerInfoData.class, PacketPlayOutSpawnEntity.class, PacketPlayOutEntityVelocity.class, - PacketPlayOutEntityDestroy.class, PacketPlayOutEntityTeleport.class, PacketPlayOutEntityMetadata.class, - PacketPlayOutSpawnEntityLiving.class, PacketPlayOutUpdateAttributes.class, PacketPlayOutEntityEquipment.class, - PacketPlayOutNamedSoundEffect.class); + PacketPlayOutSpawnEntity.class, PacketPlayOutEntityVelocity.class, PacketPlayOutEntityDestroy.class, + PacketPlayOutEntityTeleport.class, PacketPlayOutEntityMetadata.class, PacketPlayOutSpawnEntityLiving.class, + PacketPlayOutUpdateAttributes.class, PacketPlayOutEntityEquipment.class, PacketPlayOutNamedSoundEffect.class); try { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java index b36d793b9..9d631ff8d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java @@ -186,13 +186,15 @@ public class PetManager extends MiniClientPlugin _disguiseManager.addFutureDisguise(witherDisguise); pet = (Creature) location.getWorld().spawnEntity(location, EntityType.SILVERFISH); - _creatureModule.SetForce(false); - - Entity silverfish = _creatureModule.SpawnEntity(location, EntityType.SILVERFISH); - UtilEnt.Vegetate(silverfish, true); UtilEnt.silence(pet, true); - ((LivingEntity) silverfish).addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 0)); - pet.setPassenger(silverfish); + + Creature silverfish = (Creature) _creatureModule.SpawnEntity(location, EntityType.SILVERFISH); + UtilEnt.Vegetate(silverfish, true); + UtilEnt.silence(silverfish, true); + ((LivingEntity) silverfish).addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 0)); + pet.setPassenger(silverfish); + + _creatureModule.SetForce(false); } else { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index ebc060478..8c7b3cade 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -923,8 +923,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation player.setLevel(0); player.setExp(0f); - player.setPlayerTime(player.getWorld().getTime(), false); - + player.resetPlayerTime(); + player.resetPlayerWeather(); + ((CraftPlayer) player).getHandle().spectating = false; ((CraftPlayer) player).getHandle().setGhost(false); ((CraftPlayer) player).getHandle().k = true;