From 0b604fed22e9077a72dfa6cb13b8763f94d00ad7 Mon Sep 17 00:00:00 2001 From: Edouard Courty Date: Wed, 23 Dec 2020 14:26:05 +0100 Subject: [PATCH] fix (commands) permissoon usage is now effective --- .../edouardcourty/easyheal/handlers/FeedPlayerHandler.java | 6 +++++- .../edouardcourty/easyheal/handlers/HealPlayerHandler.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/edouardcourty/easyheal/handlers/FeedPlayerHandler.java b/src/main/java/com/edouardcourty/easyheal/handlers/FeedPlayerHandler.java index b13efad..4ceeefe 100644 --- a/src/main/java/com/edouardcourty/easyheal/handlers/FeedPlayerHandler.java +++ b/src/main/java/com/edouardcourty/easyheal/handlers/FeedPlayerHandler.java @@ -50,7 +50,11 @@ public static void handle(EffectPlayerCommand effectPlayerCommand) throws Player boolean isFeedingHimself = isSentByPlayer && player.getName().equals(sender.getName()); // The sender does not has the right permissions for what he's trying to do. - if (isSentByPlayer && ((!playerCanSelfFeed && isFeedingHimself) || (!playerCanFeedOthers && !isFeedingHimself))) { + if ( + isSentByPlayer && // Server does not need permission to execute the command + ((!playerCanSelfFeed && isFeedingHimself && needPermissionToFeedSelf) || + (!playerCanFeedOthers && !isFeedingHimself && needPermissionToFeedOthers)) + ) { throw new PlayerHasNoPermissionException(); } diff --git a/src/main/java/com/edouardcourty/easyheal/handlers/HealPlayerHandler.java b/src/main/java/com/edouardcourty/easyheal/handlers/HealPlayerHandler.java index 3de34a8..014beb4 100644 --- a/src/main/java/com/edouardcourty/easyheal/handlers/HealPlayerHandler.java +++ b/src/main/java/com/edouardcourty/easyheal/handlers/HealPlayerHandler.java @@ -46,7 +46,11 @@ public static void handle(EffectPlayerCommand effectPlayerCommand) throws Player boolean isHealingHimself = isSentByPlayer && player.getName().equals(sender.getName()); // The sender does not has the right permissions for what he's trying to do. - if (isSentByPlayer && ((!playerCanSelfHeal && isHealingHimself) || (!playerCanHealOthers && !isHealingHimself))) { + if ( + isSentByPlayer && // Server does not need permission to execute the command + ((!playerCanSelfHeal && isHealingHimself && needPermissionToHealSelf) || + (!playerCanHealOthers && !isHealingHimself && needPermissionToHealOthers)) + ) { throw new PlayerHasNoPermissionException(); }