From 0a04adbd0f261574413cf5c838692ff52d7ba15a Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Wed, 19 Sep 2018 23:22:59 -0500 Subject: [PATCH] Fix headless horseman Adds buy permission Actually mounts the player Disallows broken versions Removes entity on disconnect/dismount --- .../src/main/i18n/templates/lobby/LobbyMessages.properties | 4 +++- .../bukkit/gizmos/halloween/horse/HeadlessHorsemanGizmo.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Commons/core/src/main/i18n/templates/lobby/LobbyMessages.properties b/Commons/core/src/main/i18n/templates/lobby/LobbyMessages.properties index e69e0c9..08d49f7 100644 --- a/Commons/core/src/main/i18n/templates/lobby/LobbyMessages.properties +++ b/Commons/core/src/main/i18n/templates/lobby/LobbyMessages.properties @@ -57,4 +57,6 @@ trial.joinFull = join full servers trial.chooseTeam = choose their team # {0} = shop URL -trial.upgrade = Visit {0} to extend your membership. \ No newline at end of file +trial.upgrade = Visit {0} to extend your membership. + +version.too.old.gizmo = This gizmo requires at least Minecraft 1.9 \ No newline at end of file diff --git a/Lobby/src/main/java/tc/oc/lobby/bukkit/gizmos/halloween/horse/HeadlessHorsemanGizmo.java b/Lobby/src/main/java/tc/oc/lobby/bukkit/gizmos/halloween/horse/HeadlessHorsemanGizmo.java index 6f4cdcd..d81f400 100644 --- a/Lobby/src/main/java/tc/oc/lobby/bukkit/gizmos/halloween/horse/HeadlessHorsemanGizmo.java +++ b/Lobby/src/main/java/tc/oc/lobby/bukkit/gizmos/halloween/horse/HeadlessHorsemanGizmo.java @@ -35,6 +35,11 @@ public class HeadlessHorsemanGizmo extends HalloweenGizmo implements Listener { Bukkit.getPluginManager().registerEvents(this, Lobby.get()); } + @Override + public boolean canPurchase(Player player) { + return player.hasPermission("lobby.gizmo.buy.horse") || player.isOp(); + } + @EventHandler(ignoreCancelled = true) public void onPlayerInteract(PlayerInteractEvent e) { if(!(Gizmos.gizmoMap.get(e.getPlayer()) instanceof HeadlessHorsemanGizmo)