Add support for Player#getPing in Spigot

Affects issues:
- Fixed #3140
This commit is contained in:
Aurora Lahtela 2023-09-24 08:51:35 +03:00
parent 9fce4926ad
commit 2bc3f29525
2 changed files with 65 additions and 0 deletions

View File

@ -100,6 +100,7 @@ public class BukkitPingCounter extends TaskSystem.Task implements Listener {
private Optional<PingMethod> loadPingMethod() { private Optional<PingMethod> loadPingMethod() {
PingMethod[] methods = new PingMethod[]{ PingMethod[] methods = new PingMethod[]{
new SpigotPingMethod(),
new PaperPingMethod(), new PaperPingMethod(),
new ReflectiveLatencyFieldMethod(), new ReflectiveLatencyFieldMethod(),
new ReflectivePingFieldMethod(), new ReflectivePingFieldMethod(),

View File

@ -0,0 +1,64 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2018
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.djrapitops.plan.gathering.timed;
import org.bukkit.entity.Player;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
public class SpigotPingMethod implements PingMethod {
private String reasonForUnavailability;
@Override
public boolean isAvailable() {
try {
//Only available in Paper
Class.forName("org.bukkit.entity.Player").getDeclaredMethod("getPing");
return true;
} catch (ClassNotFoundException | NoSuchMethodException noSuchMethodEx) {
reasonForUnavailability = noSuchMethodEx.toString();
return false;
}
}
@Override
public int getPing(Player player) {
if (!reasonForUnavailability.isEmpty()) return -1;
try {
Method getPing = player.getClass().getDeclaredMethod("getPing");
return (int) getPing.invoke(player);
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
reasonForUnavailability = e.toString();
return -1;
}
}
@Override
public String getReasonForUnavailability() {
return reasonForUnavailability;
}
}