Skip to content

Fix jail-online-time with offline players #5701

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

Merged
JRoy merged 6 commits into from
Feb 26, 2024
Merged

Fix jail-online-time with offline players #5701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52f4f31
Get offline player reference for base
pop4959 Feb 24, 2024
1f501d8
Merge branch '2.x' into fix-5658
pop4959 Feb 25, 2024
dfdef97
Merge branch '2.x' into fix-5658
pop4959 Feb 25, 2024
4f2daf4
address the goofiness from the source
pop4959 Feb 26, 2024
cafae39
update missing usage
pop4959 Feb 26, 2024
466d31b
Merge branch '2.x' into fix-5658
pop4959 Feb 26, 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
8 changes: 8 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/PlayerExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.earth2me.essentials;

import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -31,4 +32,11 @@ public World getWorld() {
public Location getLocation() {
return base.getLocation();
}

public OfflinePlayer getOffline() {
if (base instanceof OfflinePlayerStub) {
return ((OfflinePlayerStub) base).base;
}
return base;
}
}
4 changes: 2 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandtogglejail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void run(final Server server, final CommandSource sender, final String co
if (args.length > 2) {
player.setJailTimeout(timeDiff);
// 50 MSPT (milliseconds per tick)
player.setOnlineJailedTime(ess.getSettings().isJailOnlineTime() ? ((player.getBase().getStatistic(PLAY_ONE_TICK)) + (timeDiff / 50)) : 0);
player.setOnlineJailedTime(ess.getSettings().isJailOnlineTime() ? ((player.getOffline().getStatistic(PLAY_ONE_TICK)) + (timeDiff / 50)) : 0);
}

final String tlKey;
Expand Down Expand Up @@ -121,7 +121,7 @@ public void run(final Server server, final CommandSource sender, final String co
final long displayTimeDiff = DateUtil.parseDateDiff(unparsedTime, true);
final long timeDiff = DateUtil.parseDateDiff(unparsedTime, true, ess.getSettings().isJailOnlineTime());
player.setJailTimeout(timeDiff);
player.setOnlineJailedTime(ess.getSettings().isJailOnlineTime() ? ((player.getBase().getStatistic(PLAY_ONE_TICK)) + (timeDiff / 50)) : 0);
player.setOnlineJailedTime(ess.getSettings().isJailOnlineTime() ? ((player.getOffline().getStatistic(PLAY_ONE_TICK)) + (timeDiff / 50)) : 0);
sender.sendTl("jailSentenceExtended", DateUtil.formatDateDiff(displayTimeDiff));

final String tlKey = "jailNotifySentenceExtended";
Expand Down
2 changes: 1 addition & 1 deletion providers/1_12Provider/src/main/java/com/earth2me/essentials/OfflinePlayerStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
import java.util.UUID;

public class OfflinePlayerStub implements Player {
protected final transient org.bukkit.OfflinePlayer base;
private final transient Server server;
private final transient org.bukkit.OfflinePlayer base;
private transient Location location = new Location(null, 0, 0, 0, 0, 0);
private transient World world;
private boolean allowFlight = false;
Expand Down