From 930cfa5cb87fa09ab53c0324b3e7b39648fa8188 Mon Sep 17 00:00:00 2001 From: Mysticate Date: Sat, 10 Oct 2015 02:30:11 -0400 Subject: [PATCH] DONE --- .../core/mount/types/MountSpider.java | 6 +++ .../src/mineplex/hub/modules/NewsManager.java | 46 +++++++++---------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java index ce0334a34..704a588d1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSpider.java @@ -128,6 +128,9 @@ public class MountSpider extends HorseMount for (Entry horse : GetActive().entrySet()) { + if (horse.getValue().getPassenger() != horse.getKey()) + continue; + //If player is looking up if (horse.getKey().getEyeLocation().getPitch() > -45) continue; @@ -190,6 +193,9 @@ public class MountSpider extends HorseMount { final Horse horse = GetActive().get(player); + if (horse.getPassenger() != player) + continue; + if (!UtilEnt.isGrounded(horse)) continue; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java index d0b07222c..b41043b9d 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java @@ -263,7 +263,7 @@ public class NewsManager extends MiniPlugin * Myst's sexy ass animation :> */ - _animationIndex = (_animationIndex + 1) % 127; + _animationIndex = (_animationIndex + 1) % 147; if (_animationIndex == 0) text = C.cGoldB + " "; if (_animationIndex == 1) text = C.cGoldB + " H"; @@ -340,34 +340,34 @@ public class NewsManager extends MiniPlugin if (_animationIndex == 83) text = C.cGoldB + " SPOOKY SALE "; if (_animationIndex == 84 || _animationIndex == 85) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex > 84 && _animationIndex <= 104) + if (_animationIndex > 84 && _animationIndex <= 124) { if (_animationIndex % 2 == 0) text = C.cWhiteB + "50% OFF" + C.cGoldB + " SPOOKY SALE " + C.cWhiteB + "50% OFF"; else if (_animationIndex % 2 == 1) text = C.cWhiteB + "50% OFF" + C.cRedB + " SPOOKY SALE " + C.cWhiteB + "50% OFF"; else text = C.cWhiteB + "50% OFF" + C.cYellowB + " SPOOKY SALE " + C.cWhiteB + "50% OFF"; } - if (_animationIndex == 105 || _animationIndex == 106) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 107) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 108) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 109) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 110) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 111) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 112) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 113) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 114) text = C.cGoldB + " SPOOKY SALE "; - if (_animationIndex == 115) text = C.cGoldB + "SPOOKY SALE "; - if (_animationIndex == 116) text = C.cGoldB + "POOKY SALE "; - if (_animationIndex == 117) text = C.cGoldB + "OOKY SALE "; - if (_animationIndex == 118) text = C.cGoldB + "OKY SALE "; - if (_animationIndex == 119) text = C.cGoldB + "KY SALE "; - if (_animationIndex == 120) text = C.cGoldB + "Y SALE "; - if (_animationIndex == 121) text = C.cGoldB + " SALE "; - if (_animationIndex == 122) text = C.cGoldB + "SALE "; - if (_animationIndex == 123) text = C.cGoldB + "ALE "; - if (_animationIndex == 124) text = C.cGoldB + "LE "; - if (_animationIndex == 125) text = C.cGoldB + "E "; - if (_animationIndex == 126) text = C.cGoldB + " "; + if (_animationIndex == 125 || _animationIndex == 126) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 127) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 128) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 129) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 130) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 131) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 132) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 133) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 134) text = C.cGoldB + " SPOOKY SALE "; + if (_animationIndex == 135) text = C.cGoldB + "SPOOKY SALE "; + if (_animationIndex == 136) text = C.cGoldB + "POOKY SALE "; + if (_animationIndex == 137) text = C.cGoldB + "OOKY SALE "; + if (_animationIndex == 138) text = C.cGoldB + "OKY SALE "; + if (_animationIndex == 139) text = C.cGoldB + "KY SALE "; + if (_animationIndex == 140) text = C.cGoldB + "Y SALE "; + if (_animationIndex == 141) text = C.cGoldB + " SALE "; + if (_animationIndex == 142) text = C.cGoldB + "SALE "; + if (_animationIndex == 143) text = C.cGoldB + "ALE "; + if (_animationIndex == 144) text = C.cGoldB + "LE "; + if (_animationIndex == 145) text = C.cGoldB + "E "; + if (_animationIndex == 146) text = C.cGoldB + " "; } else {