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

Change false assumption about paper methods

Browse Source 
Some paper methods are not available in old versions of Paper,
leading to exceptions.

Method for checking the existence of the methods was added

Affects issues:
- Fixed #1304
This commit is contained in:
Rsl1122 2020-01-24 10:41:04 +02:00
parent 189d076001
commit 73343f8d20
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/BukkitSensor.java
View File

@ -18,6 +18,7 @@ package com.djrapitops.plan.gathering;
import com.djrapitops.plan.Plan;
import com.djrapitops.plugin.api.Check;
import org.bukkit.Server;
import org.bukkit.World;
import javax.inject.Inject;
@ -27,19 +28,25 @@ import javax.inject.Singleton;
public class BukkitSensor implements ServerSensor<World> {
private final Plan plugin;
private final boolean hasPaper;
private final boolean hasTPSMethod;
private final boolean hasEntityCountMethod;
private final boolean hasChunkCountMethod;
@Inject
public BukkitSensor(
Plan plugin
) {
this.plugin = plugin;
hasPaper = Check.isPaperAvailable();
boolean hasPaper = Check.isPaperAvailable();
hasTPSMethod = hasPaper && hasPaperMethod(Server.class, "getTPS");
hasEntityCountMethod = hasPaper && hasPaperMethod(World.class, "getEntityCount");
hasChunkCountMethod = hasPaper && hasPaperMethod(World.class, "getChunkCount");
}
@Override
public boolean supportsDirectTPS() {
return hasPaper;
return hasTPSMethod;
}
@Override
@ -49,7 +56,7 @@ public class BukkitSensor implements ServerSensor<World> {
@Override
public int getChunkCount(World world) {
if (hasPaper) {
if (hasChunkCountMethod) {
try {
return getChunkCountPaperWay(world);
} catch (BootstrapMethodError | NoSuchMethodError e) {
@ -69,7 +76,7 @@ public class BukkitSensor implements ServerSensor<World> {
@Override
public int getEntityCount(World world) {
if (hasPaper) {
if (hasEntityCountMethod) {
try {
return getEntitiesPaperWay(world);
} catch (BootstrapMethodError | NoSuchMethodError e) {
@ -96,4 +103,12 @@ public class BukkitSensor implements ServerSensor<World> {
public Iterable<World> getWorlds() {
return plugin.getServer().getWorlds();
}
private boolean hasPaperMethod(Class<?> clazz, String methodName) {
try {
return clazz.getMethod(methodName) != null;
} catch (NoSuchMethodException e) {
return false;
}
}
}