Skip to content

Make Compatible with CraftBukkit #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrBretze wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make Compatible with CraftBukkit #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions EntityTrackerFixer/src/net/minemora/entitytrackerfixer/UntrackerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@
import java.util.HashSet;
import java.util.Set;

import net.minecraft.server.v1_14_R1.*;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
import org.bukkit.scheduler.BukkitRunnable;

import net.minecraft.server.v1_14_R1.ChunkProviderServer;
import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.MinecraftServer;
import net.minecraft.server.v1_14_R1.WorldServer;
import net.minecraft.server.v1_14_R1.PlayerChunkMap.EntityTracker;
import net.minemora.entitytrackerfixer.config.ConfigMain;
import net.minemora.entitytrackerfixer.util.ReflectionUtils;
Expand All @@ -21,6 +18,7 @@ public class UntrackerTask extends BukkitRunnable {
private static boolean running = false;

private static Field trackerField;
private static MinecraftServer server = MinecraftServer.getServer();

static {
try {
Expand All @@ -33,7 +31,7 @@ public class UntrackerTask extends BukkitRunnable {
@SuppressWarnings("deprecation")
@Override
public void run() {
if(MinecraftServer.getServer().recentTps[0] > ConfigMain.getMinTps()) {
if(getCurrentTPS() > ConfigMain.getMinTps()) {
//String tps = String.format("%.2f", MinecraftServer.getServer().recentTps[0]);
//EntityTrackerFixer.plugin.getLogger().info("Not untraking because tps = " + tps);
return;
Expand Down Expand Up @@ -112,4 +110,12 @@ public static boolean isRunning() {
return running;
}

public double getCurrentTPS()
{
return Math.min(1000 / getCurrentDurationTime(), 20);
}

public static double getCurrentDurationTime() {
return MathHelper.a(server.f) * 1.0E-6D;
}
}