Added offlineplayer support for syntax

Sharpjaws · Jul 30, 2017 · 91dcdc3 · 91dcdc3
1 parent fb99e25
commit 91dcdc3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/me/sharpjaws/sharpSK/hooks/PermissionsEx/EffPexRemoveGroupFromPlayer.java b/src/main/java/me/sharpjaws/sharpSK/hooks/PermissionsEx/EffPexRemoveGroupFromPlayer.java
@@ -2,36 +2,42 @@
 
 import javax.annotation.Nullable;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
+import ru.tehkode.permissions.PermissionUser;
 import ru.tehkode.permissions.bukkit.PermissionsEx;
 
 public class EffPexRemoveGroupFromPlayer extends Effect {
 	private Expression<String> s;
-	private Expression<Player> player;
+	private Expression<OfflinePlayer> p;
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public boolean init(Expression<?>[] expr, int matchedPattern, Kleenean paramKleenean,
 			SkriptParser.ParseResult paramParseResult) {
 		s = (Expression<String>) expr[0];
-		player = (Expression<Player>) expr[1];
+		p = (Expression<OfflinePlayer>) expr[1];
 
 		return true;
 	}
 
 	@Override
 	public String toString(@Nullable Event paramEvent, boolean paramBoolean) {
-		return "pex remove group %string% from %player%";
+		return "pex remove group %string% from %offlineplayers%";
 	}
 
 	@Override
 	protected void execute(Event e) {
-		PermissionsEx.getUser(player.getSingle(e)).removeGroup(s.getSingle(e));
+		for (OfflinePlayer op : p.getAll(e)){
+			PermissionUser permuser = PermissionsEx.getPermissionManager().getUser(op.getUniqueId());
+			permuser.removeGroup(s.getSingle(e));
+			}
+
 	}
 }
diff --git a/src/main/java/me/sharpjaws/sharpSK/hooks/PermissionsEx/PermissionsExRegistry.java b/src/main/java/me/sharpjaws/sharpSK/hooks/PermissionsEx/PermissionsExRegistry.java
@@ -15,7 +15,7 @@ public static void registerPermissionsEx() {
 		Skript.registerEffect(EffAddPexPerm.class, "pex add perm[ission] %string% to %offlineplayers%");
 		Skript.registerEffect(EffPexAddgroup.class, "pex add group %string% to %offlineplayers%");
 		Skript.registerEffect(EffPexRemoveGroupFromPlayer.class,
-				"pex (remove|delete) group %string% from %players%");
+				"pex (remove|delete) group %string% from %offlineplayers%");
 		Skript.registerEffect(EffPexAddPermGroup.class,
 				"pex add perm[ission] %string% to group %string%");
 		Skript.registerEffect(EffPexRemovePermGroup.class,