Skip to content

Add OfflinePlayer#ifOnline #10197

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

Closed
Leguan16 wants to merge 1 commit into from
Closed

Add OfflinePlayer#ifOnline #10197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions patches/api/0459-Add-OfflinePlayer-ifOnline.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: leguan <longboard.noah@gmail.com>
Date: Sun, 28 Jan 2024 19:05:33 +0100
Subject: [PATCH] Add OfflinePlayer#ifOnline


diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..2b7a49e595bf42a0bf80e0715f3912467b2d3eb6 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -545,4 +545,12 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
*/
@Nullable
public Location getLocation();
+
+ // Paper start - Add OfflinePlayer#ifOnline
+ /**
+ * Runs the provided consumer if the player is online.
+ * @param consumer the consumer that has to be run.
+ */
+ void ifOnline(java.util.function.@NotNull Consumer<Player> consumer);
+ // Paper end - Add OfflinePlayer#ifOnline
}
46 changes: 46 additions & 0 deletions patches/server/1045-Add-OfflinePlayer-ifOnline.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: leguan <longboard.noah@gmail.com>
Date: Sun, 28 Jan 2024 19:39:01 +0100
Subject: [PATCH] Add OfflinePlayer#ifOnline


diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
index 4a875bce9563f3b9351ebecde9b0eb1287beb50e..a5ce3a727271b6808fefa4c61989c6e949ecdd5f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -358,6 +358,15 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
return null;
}

+ // Paper start - Add OfflinePlayer#ifOnline
+ @Override
+ public void ifOnline(final java.util.function.@org.jetbrains.annotations.NotNull Consumer<Player> consumer) {
+ if (this.isOnline()) {
+ consumer.accept(this.getPlayer());
+ }
Comment on lines +18 to +20
Copy link
Copy Markdown
Contributor

@montlikadani montlikadani Jan 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could save some resource by caching getPlayer into a variable as isOnline invokes getPlayer and performs a not-null condition.

Suggested change
+ if (this.isOnline()) {
+ consumer.accept(this.getPlayer());
+ }
Player player = this.getPlayer();
if (player != null) {
consumer.accept(player);
}

and do the same in CraftPlayer

Copy link
Copy Markdown
Contributor Author

@Leguan16 Leguan16 Jan 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point.

+ }
+ // Paper end - Add OfflinePlayer#ifOnline
+
@Override
public Location getBedSpawnLocation() {
return this.getRespawnLocation();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 39b25c2478eadd373383a3445a7f27ea30d18550..79e6e82fa0c56189f578ba7fd320e056bde481e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1576,6 +1576,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
CraftStatistic.setStatistic(this.getHandle().getStats(), statistic, entityType, newValue, this.getHandle());
}

+ // Paper start - Add OfflinePlayer#ifOnline
+ @Override
+ public void ifOnline(final java.util.function.@org.jetbrains.annotations.NotNull Consumer<Player> consumer) {
+ if (this.isOnline()) {
+ consumer.accept(this.getPlayer());
+ }
+ }
+ // Paper end - Add OfflinePlayer#ifOnline
+
@Override
public void setPlayerTime(long time, boolean relative) {
this.getHandle().timeOffset = time;