Fix ping for 1.70+

Elikill58 · Apr 27, 2024 · 29a6553 · 29a6553
1 parent 360dcb4
commit 29a6553
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/spigot/src/com/elikill58/negativity/spigot/nms/SpigotVersionAdapter.java b/spigot/src/com/elikill58/negativity/spigot/nms/SpigotVersionAdapter.java
@@ -129,8 +129,8 @@ public List<Player> getOnlinePlayers() {
 
  public int getPlayerPing(Player player) {
  try {
- if (version.isNewerOrEquals(Version.V1_20_2)) {
- return pingField.getInt(getPlayerConnection(player));
+ if (version.isNewerOrEquals(Version.V1_17)) {
+ return (int) player.getClass().getDeclaredMethod("getPing").invoke(player);
  } else {
  return pingField.getInt(getPlayerHandle.invoke(player));
  }
@@ -321,6 +321,8 @@ public static SpigotVersionAdapter getVersionAdapter() {
  return instance = new Spigot_1_20_R2();
  case "v1_20_R3":
  return instance = new Spigot_1_20_R3();
+ case "v1_20_R4":
+ return instance = new Spigot_1_20_R4();
  default:
  return instance = new Spigot_UnknowVersion(VERSION);
  }

diff --git a/spigot/src/com/elikill58/negativity/spigot/nms/Spigot_1_20_R4.java b/spigot/src/com/elikill58/negativity/spigot/nms/Spigot_1_20_R4.java
@@ -0,0 +1,15 @@
+package com.elikill58.negativity.spigot.nms;
+
+import com.elikill58.negativity.spigot.utils.PacketUtils;
+
+public class Spigot_1_20_R4 extends SpigotVersionAdapter {
+
+ public Spigot_1_20_R4() {
+ super(PacketUtils.getProtocolVersion());
+ }
+
+ @Override
+ public String getTpsFieldName() {
+ return "ab";
+ }
+}