Redstoner/Modules
Archived
0
Fork 0
Code Activity

Made ping not use a version specific import.

Browse Source
This commit is contained in:
David Panić
2018-12-15 23:14:29 +01:00
parent 6a6a6f5507
commit f6c5f69e9c
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/redstoner/modules/misc/Misc.java
View File

@@ -1,12 +1,12 @@
package com.redstoner.modules.misc; package com.redstoner.modules.misc;
import java.lang.reflect.InvocationTargetException;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@@ -135,8 +135,13 @@ public class Misc implements Module, Listener
if (sender instanceof Player) if (sender instanceof Player)
{ {
int ping = getPing((Player) sender); int ping = getPing((Player) sender);
if (ping == -1) {
getLogger().message(sender, "An error occured while getting your ping! Please message a staff member.");
} else {
getLogger().message(sender, "Your ping is " + ping + "ms."); getLogger().message(sender, "Your ping is " + ping + "ms.");
} }
}
else else
{ {
sender.sendMessage("Pong!"); sender.sendMessage("Pong!");
@@ -151,12 +156,17 @@ public class Misc implements Module, Listener
if (sender instanceof Player) if (sender instanceof Player)
{ {
int ping = getPing((Player) sender); int ping = getPing((Player) sender);
if (ping == -1) {
getLogger().message(sender, "An error occured while getting your ping! Please message a staff member.");
} else {
getLogger().message(sender, new String[] {"Your ping is " + ping + "ms.", ping < 20 getLogger().message(sender, new String[] {"Your ping is " + ping + "ms.", ping < 20
? "&aThat's gr8 m8 r8 8/8" ? "&aThat's gr8 m8 r8 8/8"
: (ping < 50 ? "F&eair enough you cunt!" : (ping < 50 ? "F&eair enough you cunt!"
: (ping < 100 ? "&eShite, but not shite enough." : (ping < 100 ? "&eShite, but not shite enough."
: "&cLooks like the server is about two months ahead of you. GET A NEW FRIGGIN' ISP ALREADY"))}); : "&cLooks like the server is about two months ahead of you. GET A NEW FRIGGIN' ISP ALREADY"))});
} }
}
else else
getLogger().message(sender, true, getLogger().message(sender, true,
"M8 you shitty cunt are not supposed to run this shit it's for players only!!!"); "M8 you shitty cunt are not supposed to run this shit it's for players only!!!");
@@ -167,7 +177,15 @@ public class Misc implements Module, Listener
public int getPing(Player player) public int getPing(Player player)
{ {
return ((CraftPlayer) player).getHandle().ping; try {
Object entityPlayer = player.getClass().getMethod("getHandle").invoke(player);
int ping = (int) entityPlayer.getClass().getField("ping").get(entityPlayer);
return ping;
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | NoSuchFieldException e) {
e.printStackTrace();
}
return -1;
} }
@Command(hook = "sudo") @Command(hook = "sudo")