From 930f90fdf3a9c132f13f3bb497a5dd54b8bd32fc Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 22 Aug 2017 20:12:15 +0100 Subject: [PATCH] GH Mount fixes --- .../gemhunters/GemHuntersMountGadget.java | 2 +- .../gemhunters/GemHuntersMountType.java | 6 +++++ .../gemhunters/mount/MountModule.java | 23 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountGadget.java index ee9b7f02e..c1cadebd0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountGadget.java @@ -15,7 +15,7 @@ public class GemHuntersMountGadget extends GameModifierGadget { super(manager, category, type.getName() + " Mount", new String[] { C.cGray + "Changed your active Mount", - C.cGray + "in " + F.greenElem("Gem Hunters") + "to " + type.getName() + ".", + C.cGray + "in " + F.greenElem("Gem Hunters") + " to " + type.getName() + ".", }, -7, type.getMaterial(), type.getMaterialData()); _type = type; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountType.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountType.java index a6aeca4ff..5f9d2ed11 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountType.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Horse; import org.bukkit.entity.Horse.Variant; import mineplex.core.disguise.DisguiseManager; +import mineplex.core.updater.event.UpdateEvent; import mineplex.core.utils.UtilVariant; public enum GemHuntersMountType @@ -18,6 +19,7 @@ public enum GemHuntersMountType { return UtilVariant.spawnHorse(location, Variant.DONKEY); } + }; private final String _name; @@ -38,6 +40,10 @@ public enum GemHuntersMountType public abstract Horse spawn(Location location, DisguiseManager manager); + public void onUpdate(UpdateEvent event, Horse horse) + { + } + public String getName() { return _name; diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java index 62458c0f3..691d4989d 100644 --- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java +++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java @@ -30,6 +30,7 @@ import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilServer; import mineplex.core.disguise.DisguiseManager; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.gamemodifiers.GameCosmeticManager; @@ -321,4 +322,26 @@ public class MountModule extends MiniClientPlugin event.setCancelled(true); } } + + @EventHandler + public void updateSkins(UpdateEvent event) + { + for (Player player : UtilServer.getPlayersCollection()) + { + MountData data = Get(player); + + if (data.getEntity() == null) + { + return; + } + + GemHuntersMountGadget gadget = (GemHuntersMountGadget) _gadget.getGameCosmeticManager().getActiveCosmetic( + player, + GameDisplay.GemHunters, + "Mount Skins" + ); + + gadget.getType().onUpdate(event, data.getEntity()); + } + } }