zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed errors pertaining the CPU lib on startup on some systems (fixes #591)

Browse source
This commit is contained in:
Intelli 2024-08-15 19:04:31 -06:00
parent 64eedb0aa3
commit d2bffb2103
4 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/net/coreprotect/utility/Util.java
View file

@ -53,8 +53,6 @@ import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.Plugin;
import org.bukkit.util.io.BukkitObjectOutputStream;
import org.jutils.jhardware.HardwareInfo;
import org.jutils.jhardware.model.ProcessorInfo;
import net.coreprotect.CoreProtect;
import net.coreprotect.bukkit.BukkitAdapter;
@ -68,6 +66,8 @@ import net.coreprotect.thread.CacheHandler;
import net.coreprotect.thread.Scheduler;
import net.coreprotect.utility.serialize.ItemMetaHandler;
import net.coreprotect.worldedit.CoreProtectEditSessionEvent;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
public class Util extends Queue {
@ -116,11 +116,12 @@ public class Util extends Queue {
return name;
}
public static ProcessorInfo getProcessorInfo() {
ProcessorInfo result = null;
public static CentralProcessor getProcessorInfo() {
CentralProcessor result = null;
try {
Configurator.setLevel("com.profesorfalken.jsensors.manager.unix.UnixSensorsManager", Level.OFF);
result = HardwareInfo.getProcessorInfo();
Configurator.setLevel("oshi.hardware.common.AbstractCentralProcessor", Level.OFF);
SystemInfo systemInfo = new SystemInfo();
result = systemInfo.getHardware().getProcessor();
}
catch (Exception e) {
// unable to read processor information