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

ExprPlayerViewDistance - re-enable this expression #5333

Merged
merged 13 commits into from
Feb 7, 2023
Merged

ExprPlayerViewDistance - re-enable this expression #5333

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6b56242
ExprPlayerViewDistance - re-enable this expression
ShaneBeee Jan 8, 2023
1d76ed9
ExprPlayerViewDistance - re-enable this expression
ShaneBeee Jan 8, 2023
03ff8de
ExprPlayerViewDistance - add note regarding return
ShaneBeee Jan 10, 2023
0b3eecf
ExprPlayerViewDistance - fix note that i put in examples by accident
ShaneBeee Jan 17, 2023
5270157
ExprPlayerViewDistance - cleanup
ShaneBeee Jan 17, 2023
bed77a1
ExprPlayerViewDistance - cleanup
ShaneBeee Jan 18, 2023
0cd42a2
ExprPlayerViewDistance - cleanup
ShaneBeee Jan 18, 2023
8748f77
Update src/main/java/ch/njol/skript/expressions/ExprPlayerViewDistanc…
ShaneBeee Jan 26, 2023
ff7381e
Update src/main/java/ch/njol/skript/expressions/ExprPlayerViewDistanc…
ShaneBeee Jan 26, 2023
eb6e076
ExprPlayerViewDistance - make methods static as per Pickle's suggestion
ShaneBeee Jan 26, 2023
93447c0
Merge branch 'master' into fix/view-distance
ShaneBeee Jan 26, 2023
3a29c9d
ExprPlayerViewDistance - update docs and reimplement check for method
ShaneBeee Jan 27, 2023
0a87443
Merge branch 'master' into fix/view-distance
ShaneBeee Feb 6, 2023
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
Next Next commit
ExprPlayerViewDistance - re-enable this expression
  • Loading branch information
@ShaneBeee
ShaneBeee committed Jan 8, 2023
commit 6b56242b37d05cb24cded44647d0e8e325d99d57
19 changes: 13 additions & 6 deletions src/main/java/ch/njol/skript/expressions/ExprPlayerViewDistance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import ch.njol.skript.lang.SkriptParser;
import ch.njol.util.Kleenean;
import ch.njol.util.coll.CollectionUtils;
import org.apache.commons.lang.NotImplementedException;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
Expand All @@ -39,13 +40,13 @@
@Description("The view distance of a player. Can be changed.")
@Examples({"set view distance of player to 10", "set {_view} to view distance of player",
"reset view distance of all players", "add 2 to view distance of player"})
ShaneBeee marked this conversation as resolved.
Show resolved Hide resolved
@RequiredPlugins("Paper 1.9-1.13.2")
@RequiredPlugins("Paper")
@Since("2.4")
public class ExprPlayerViewDistance extends PropertyExpression<Player, Long> {
ShaneBeee marked this conversation as resolved.
Show resolved Hide resolved

static {
// Not supported on 1.14 yet
if (Skript.methodExists(Player.class, "getViewDistance") && !Skript.isRunningMinecraft(1, 14))
if (Skript.methodExists(Player.class, "getViewDistance"))
register(ExprPlayerViewDistance.class, Long.class, "view distance[s]", "players");
}

Expand Down Expand Up @@ -82,23 +83,29 @@ public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
case DELETE:
ShaneBeee marked this conversation as resolved.
Show resolved Hide resolved
case SET:
for (Player player : getExpr().getArray(e))
player.setViewDistance(distance);
setViewDistance(player, distance);
break;
case ADD:
for (Player player : getExpr().getArray(e))
player.setViewDistance(player.getViewDistance() + distance);
setViewDistance(player, player.getViewDistance() + distance);
break;
case REMOVE:
for (Player player : getExpr().getArray(e))
player.setViewDistance(player.getViewDistance() - distance);
setViewDistance(player,player.getViewDistance() - distance);
break;
case RESET:
for (Player player : getExpr().getArray(e))
player.setViewDistance(Bukkit.getServer().getViewDistance());
setViewDistance(player, Bukkit.getServer().getViewDistance());
default:
assert false;
}
}

private void setViewDistance(Player player, int distance) {
ShaneBeee marked this conversation as resolved.
Show resolved Hide resolved
try {
player.setViewDistance(distance);
} catch (NotImplementedException ignore) {}
}

@Override
public Class<? extends Long> getReturnType() {
Expand Down