Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-02 16:38:10 +02:00
Code Issues Projects Releases Wiki Activity

Moved bukkit ping method check to enable

Browse Source 
This static block was causing compatibility issues with some plugins that
modify classes at runtime.

Affects issues:
- Possibly fixed #1492
- References https://github.com/konsolas/AAC-Issues/issues/1971
This commit is contained in:
Risto Lahtela 2020-08-08 17:02:20 +03:00
parent 0f0e425e9b
commit 23b9d79dca
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/timed/BukkitPingCounter.java
View File

@ -65,12 +65,34 @@ public class BukkitPingCounter extends AbsRunnable implements Listener {
//the server is pinging the client every 40 Ticks (2 sec) - so check it then
//https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/PlayerConnection.java#L178
private static final boolean PING_METHOD_AVAILABLE;
private static boolean PING_METHOD_AVAILABLE;
private static final MethodHandle PING_FIELD;
private static final MethodHandle GET_HANDLE_METHOD;
private static MethodHandle PING_FIELD;
private static MethodHandle GET_HANDLE_METHOD;
static {
@Inject
public BukkitPingCounter(
PlanConfig config,
DBSystem dbSystem,
ServerInfo serverInfo,
RunnableFactory runnableFactory
) {
BukkitPingCounter.loadPingMethodDetails();
this.config = config;
this.dbSystem = dbSystem;
this.serverInfo = serverInfo;
this.runnableFactory = runnableFactory;
playerHistory = new HashMap<>();
}
private final Map<UUID, List<DateObj<Integer>>> playerHistory;
private final PlanConfig config;
private final DBSystem dbSystem;
private final ServerInfo serverInfo;
private final RunnableFactory runnableFactory;
private static void loadPingMethodDetails() {
PING_METHOD_AVAILABLE = isPingMethodAvailable();
MethodHandle localHandle = null;
@ -103,27 +125,6 @@ public class BukkitPingCounter extends AbsRunnable implements Listener {
PING_FIELD = localPing;
}
private final Map<UUID, List<DateObj<Integer>>> playerHistory;
private final PlanConfig config;
private final DBSystem dbSystem;
private final ServerInfo serverInfo;
private final RunnableFactory runnableFactory;
@Inject
public BukkitPingCounter(
PlanConfig config,
DBSystem dbSystem,
ServerInfo serverInfo,
RunnableFactory runnableFactory
) {
this.config = config;
this.dbSystem = dbSystem;
this.serverInfo = serverInfo;
this.runnableFactory = runnableFactory;
playerHistory = new HashMap<>();
}
private static boolean isPingMethodAvailable() {
try {
//Only available in Paper