Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add warnings for using %player% without using the UUID config setting. #6271

Merged
merged 4 commits into from
Jan 1, 2024
Merged

Add warnings for using %player% without using the UUID config setting. #6271

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ff1488
Update VariableString.java
sovdeeth Dec 31, 2023
7558fed
messed up imports
sovdeeth Dec 31, 2023
4b1ad09
Catch offline players
sovdeeth Dec 31, 2023
e6aa8da
Merge branch 'dev/feature' into uuid-warnings
sovdeeth Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions src/main/java/ch/njol/skript/lang/VariableString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,8 @@
*/
package ch.njol.skript.lang;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;

import org.bukkit.ChatColor;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.NotNull;
import org.skriptlang.skript.lang.script.Script;

import com.google.common.collect.Lists;

import ch.njol.skript.Skript;
import ch.njol.skript.SkriptConfig;
import ch.njol.skript.classes.Changer.ChangeMode;
import ch.njol.skript.classes.ClassInfo;
import ch.njol.skript.expressions.ExprColoured;
Expand All @@ -54,6 +41,19 @@
import ch.njol.util.StringUtils;
import ch.njol.util.coll.CollectionUtils;
import ch.njol.util.coll.iterator.SingleItemIterator;
import com.google.common.collect.Lists;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.NotNull;
import org.skriptlang.skript.lang.script.Script;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;

/**
* Represents a string that may contain expressions, and is thus "variable".
Expand Down Expand Up @@ -229,6 +229,12 @@ public static VariableString newInstance(String orig, StringMode mode) {
log.printErrors("Can't understand this expression: " + s.substring(c + 1, c2));
return null;
} else {
if (!SkriptConfig.usePlayerUUIDsInVariableNames.value() && expr.getReturnType() == Player.class) {
Skript.warning(
"In the future, players in variable names will use the player's UUID instead of their name. " +
"For information on how to make sure your scripts won't be impacted by this change, see https://github.com/SkriptLang/Skript/discussions/6270."
);
}
string.add(expr);
}
log.printLog();
Expand Down