diff --git a/patches/server/0203-Gamemode-extra-permissions.patch b/patches/server/0203-Gamemode-extra-permissions.patch
index 40adf3cdc..284d8b966 100644
--- a/patches/server/0203-Gamemode-extra-permissions.patch
+++ b/patches/server/0203-Gamemode-extra-permissions.patch
@@ -31,17 +31,43 @@ index 4480fe75cfad35a5104b5116c5ec2c80d18f15f5..d73daa29f784283e03ad2ea3126cca7e
          return this.d;
      }
 diff --git a/src/main/java/net/minecraft/server/commands/CommandGamemode.java b/src/main/java/net/minecraft/server/commands/CommandGamemode.java
-index 8da48d9cbadfbe83ae8410cf49d78df49f50fb08..94af223c5d241f9f26a12fcb8bf6343953ff80e5 100644
+index 8da48d9cbadfbe83ae8410cf49d78df49f50fb08..323fa988529a7ad316a4dc8d3fc0f62b1478c334 100644
 --- a/src/main/java/net/minecraft/server/commands/CommandGamemode.java
 +++ b/src/main/java/net/minecraft/server/commands/CommandGamemode.java
-@@ -55,6 +55,7 @@ public class CommandGamemode {
+@@ -55,6 +55,21 @@ public class CommandGamemode {
      }
  
      private static int a(CommandContext<CommandListenerWrapper> commandcontext, Collection<EntityPlayer> collection, EnumGamemode enumgamemode) {
-+        if (net.pl3x.purpur.PurpurConfig.commandGamemodeRequiresPermission && !commandcontext.getSource().testPermission(2, "minecraft.command.gamemode." + enumgamemode.b())) return 0; // Purpur
++        // Purpur start
++        if (net.pl3x.purpur.PurpurConfig.commandGamemodeRequiresPermission) {
++            String gamemode = enumgamemode.getName();
++            CommandListenerWrapper sender = commandcontext.getSource();
++            if (!sender.testPermission(2, "minecraft.command.gamemode." + gamemode)) {
++                return 0;
++            }
++            if (sender.getEntity() instanceof EntityPlayer) {
++                EntityPlayer player = (EntityPlayer) sender.getEntity();
++                if ((collection.size() > 1 || !collection.contains(player)) && !sender.testPermission(2, "minecraft.command.gamemode." + gamemode + ".other")) {
++                    return 0;
++                }
++            }
++        }
++        // Purpur end
          int i = 0;
          Iterator iterator = collection.iterator();
  
+diff --git a/src/main/java/net/minecraft/world/level/EnumGamemode.java b/src/main/java/net/minecraft/world/level/EnumGamemode.java
+index eea551a68ba44927cb23560b898dd2c17f041442..1b049bdc897aaf1f0cb9b6dfeaf3a1e44214aef1 100644
+--- a/src/main/java/net/minecraft/world/level/EnumGamemode.java
++++ b/src/main/java/net/minecraft/world/level/EnumGamemode.java
+@@ -20,6 +20,7 @@ public enum EnumGamemode {
+         return this.f;
+     }
+ 
++    public String getName() { return b(); } // Purpur - OBFHELPER
+     public String b() {
+         return this.g;
+     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index e0228fb58149ac8a9430d54157d5e92c93618f22..56424e45c04e7165c0671f74cdcd0147d1069af7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -59,18 +85,21 @@ index e0228fb58149ac8a9430d54157d5e92c93618f22..56424e45c04e7165c0671f74cdcd0147
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-index f0a57d225b81a505ff12425155ba838d8fad990c..81ead4723872528c53efa9e0f23799571447ac86 100644
+index f0a57d225b81a505ff12425155ba838d8fad990c..9341bba9e48d4def2609d759a0dea7e099d5d777 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-@@ -23,7 +23,12 @@ public final class CommandPermissions {
+@@ -23,7 +23,15 @@ public final class CommandPermissions {
          DefaultPermissions.registerPermission(PREFIX + "kick", "Allows the user to kick players", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(PREFIX + "stop", "Allows the user to stop the server", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(PREFIX + "list", "Allows the user to list all online players", PermissionDefault.OP, commands);
 -        DefaultPermissions.registerPermission(PREFIX + "gamemode", "Allows the user to change the gamemode of another player", PermissionDefault.OP, commands);
 +        // Purpur start
-+        Permission gamemode = DefaultPermissions.registerPermission(PREFIX + "gamemode", "Allows the user to change the gamemode of another player", PermissionDefault.OP, commands);
++        Permission gamemodeVanilla = DefaultPermissions.registerPermission(PREFIX + "gamemode", "Allows the user to change the gamemode", PermissionDefault.OP, commands);
 +        for (net.minecraft.world.level.EnumGamemode enumgamemode : net.minecraft.world.level.EnumGamemode.values()) {
-+            gamemode.addParent(DefaultPermissions.registerPermission(PREFIX + "gamemode." + enumgamemode.b(), "Allows the user to set " + enumgamemode.b() + " gamemode", PermissionDefault.OP), true);
++            Permission gamemodeSelf = DefaultPermissions.registerPermission(PREFIX + "gamemode." + enumgamemode.getName(), "Allows the user to set " + enumgamemode.getName() + " gamemode for self", PermissionDefault.OP);
++            Permission gamemodeOther = DefaultPermissions.registerPermission(PREFIX + "gamemode." + enumgamemode.getName() + ".other", "Allows the user to set " + enumgamemode.getName() + " gamemode for other players", PermissionDefault.OP);
++            gamemodeSelf.addParent(gamemodeOther, true);
++            gamemodeVanilla.addParent(gamemodeSelf, true);
 +        }
 +        // Purpur end
          DefaultPermissions.registerPermission(PREFIX + "xp", "Allows the user to give themselves or others arbitrary values of experience", PermissionDefault.OP, commands);