Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

fix error

Browse Source
This commit is contained in:
xjboss 2017-07-23 15:22:06 +08:00
parent e5dae008ef
commit ca3fcd2753
1 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/pw/yumc/KCXStatistics.java
View File

@ -19,10 +19,12 @@ import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent;
import kcauldron.KCauldron; import kcauldron.KCauldron;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
@ -77,11 +79,6 @@ public class KCXStatistics {
*/ */
private volatile Thread task = null; private volatile Thread task = null;
/**
* 统计线程
*/
private volatile StatisticsTimer timer = null;
/** /**
* 插件使用数据统计 * 插件使用数据统计
* *
@ -195,9 +192,8 @@ public class KCXStatistics {
if (task != null) { if (task != null) {
return true; return true;
} }
timer = new StatisticsTimer();
// 开启TPS统计线程 // 开启TPS统计线程
MinecraftForge.EVENT_BUS.register(timer); //MinecraftForge.EVENT_BUS.register(timer);
// 开启发送数据线程 // 开启发送数据线程
task = new Thread(new Runnable() { task = new Thread(new Runnable() {
@Override @Override
@ -236,7 +232,7 @@ public class KCXStatistics {
data.put("guid", guid); data.put("guid", guid);
data.put("server_version", Bukkit.getVersion()); data.put("server_version", Bukkit.getVersion());
data.put("server_port", Bukkit.getServer().getPort()); data.put("server_port", Bukkit.getServer().getPort());
data.put("server_tps", timer.getAverageTPS()); data.put("server_tps", FMLCommonHandler.instance().getMinecraftServerInstance().recentTps[1]);
data.put("plugin_version", KCauldron.getCurrentVersion()); data.put("plugin_version", KCauldron.getCurrentVersion());
data.put("players_online", getOnlinePlayerNumber()); data.put("players_online", getOnlinePlayerNumber());
data.put("os_name", System.getProperty("os.name")); data.put("os_name", System.getProperty("os.name"));
@ -257,40 +253,4 @@ public class KCXStatistics {
final JSONObject result = (JSONObject) JSONValue.parse(postData(url, jsondata)); final JSONObject result = (JSONObject) JSONValue.parse(postData(url, jsondata));
print("Plugin: " + pluginname + " Recover Data From CityCraft Data Center: " + result.get("info")); print("Plugin: " + pluginname + " Recover Data From CityCraft Data Center: " + result.get("info"));
} }
public class StatisticsTimer implements Runnable {
private LinkedList<Double> history = new LinkedList();
private transient long lastPoll = System.nanoTime();
int t=0;
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void onServerTick(TickEvent.ServerTickEvent event) {
if(++t==20){
t=0;
run();
}
}
/**
* @return 获得TPS
*/
public double getAverageTPS() {
double avg = 0.0D;
for (Double f : history) {
avg += f;
}
return avg / history.size();
}
@Override
public void run() {
long startTime = System.nanoTime();
long timeSpent = (startTime - lastPoll) / 1000;
if (history.size() > 10) {
history.removeFirst();
}
double ttps = 2.0E7D / (timeSpent == 0 ? 1 : timeSpent);
if (ttps <= 21.0D) {
history.add(ttps);
}
lastPoll = startTime;
}
}
} }