Forward skinPerm config to bukkit to check it only if necessary

games647 · Sep 27, 2016 · 52d7913 · 52d7913
1 parent 4b83213
commit 52d7913
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 ##### 2.3.3
 
+* Forward skinPerm config to bukkit to check it only if necessary 
 * Fix missing bungeecord aliases
+* Fix forwarding permission checking
+* Fix lowercase bungee perm
 
 ##### 2.3.2
 

diff --git a/bukkit/src/main/java/com/github/games647/changeskin/bukkit/listener/BungeeCordListener.java b/bukkit/src/main/java/com/github/games647/changeskin/bukkit/listener/BungeeCordListener.java
@@ -64,10 +64,11 @@ private void checkPermissions(Player player, ByteArrayDataInput dataInput) {
 
         //continue on success only
         String receiverUUID = dataInput.readUTF();
+        boolean skinPerm = dataInput.readBoolean();
         boolean isOp = dataInput.readBoolean();
 
         SkinData targetSkin = new SkinData(encodedData, encodedSignature);
-        if (isOp || checkBungeePerms(player, UUID.fromString(receiverUUID), targetSkin.getUuid())) {
+        if (isOp || checkBungeePerms(player, UUID.fromString(receiverUUID), targetSkin.getUuid(), skinPerm)) {
             ByteArrayDataOutput out = ByteStreams.newDataOutput();
             out.writeUTF("PermissionsSuccess");
             out.writeInt(skinId);
@@ -83,13 +84,21 @@ private void checkPermissions(Player player, ByteArrayDataInput dataInput) {
         }
     }
 
-    private boolean checkBungeePerms(Player player, UUID receiverUUID, UUID targetUUID) {
+    private boolean checkBungeePerms(Player player, UUID receiverUUID, UUID targetUUID, boolean skinPerm) {
         if (player.getUniqueId().equals(receiverUUID)) {
-            return player.hasPermission(plugin.getName().toLowerCase() + ".command.setskin")
-                && plugin.checkPermission(player, targetUUID, false);
+            boolean hasCommandPerm = player.hasPermission(plugin.getName().toLowerCase() + ".command.setskin");
+            if (skinPerm) {
+                return hasCommandPerm && plugin.checkPermission(player, targetUUID, false);
+            } else {
+                return hasCommandPerm;
+            }
         } else {
-            return player.hasPermission(plugin.getName().toLowerCase() + ".command.setskin.other")
-                    && plugin.checkPermission(player, targetUUID, false);
+            boolean hasCommandPerm = player.hasPermission(plugin.getName().toLowerCase() + ".command.setskin.other");
+            if (skinPerm) {
+                return hasCommandPerm && plugin.checkPermission(player, targetUUID, false);
+            } else {
+                return hasCommandPerm;
+            }
         }
     }
 }
diff --git a/bungee/src/main/java/com/github/games647/changeskin/bungee/tasks/SkinUpdater.java b/bungee/src/main/java/com/github/games647/changeskin/bungee/tasks/SkinUpdater.java
@@ -48,8 +48,11 @@ public void run() {
             out.writeInt(targetSkin.getSkinId());
             out.writeUTF(targetSkin.getEncodedData());
             out.writeUTF(targetSkin.getEncodedSignature());
+
             out.writeUTF(receiver.getUniqueId().toString());
+            out.writeBoolean(plugin.getConfig().getBoolean("skinPermission"));
             out.writeBoolean(bukkitOp);
+
             server.sendData(plugin.getName(), out.toByteArray());
             return;
         }