diff --git a/buildNumber.properties b/buildNumber.properties index 45003335..afe971cc 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Sat Mar 23 19:48:52 EDT 2024 -buildNumber=82 +#Sun Mar 24 15:51:37 EDT 2024 +buildNumber=83 diff --git a/src/main/java/electrosphere/engine/profiler/Profiler.java b/src/main/java/electrosphere/engine/profiler/Profiler.java index b6dac7b0..06bd5e07 100644 --- a/src/main/java/electrosphere/engine/profiler/Profiler.java +++ b/src/main/java/electrosphere/engine/profiler/Profiler.java @@ -13,7 +13,7 @@ import org.lwjgl.util.remotery.Remotery; public class Profiler { //controls whether to profile or not - public static final boolean PROFILE = true; + public static boolean PROFILE = true; //pointer to the global instance long pointer = -1; @@ -22,10 +22,12 @@ public class Profiler { * Creates the profiler */ public Profiler(){ - try(MemoryStack stack = MemoryStack.stackPush()){ - PointerBuffer allocBuffer = stack.mallocPointer(1); - Remotery.rmt_CreateGlobalInstance(allocBuffer); - pointer = allocBuffer.get(); + if(PROFILE){ + try(MemoryStack stack = MemoryStack.stackPush()){ + PointerBuffer allocBuffer = stack.mallocPointer(1); + Remotery.rmt_CreateGlobalInstance(allocBuffer); + pointer = allocBuffer.get(); + } } } diff --git a/src/test/java/entity/SpawningCreaturesTest.java b/src/test/java/entity/SpawningCreaturesTest.java index 4c41e03b..26f7d409 100644 --- a/src/test/java/entity/SpawningCreaturesTest.java +++ b/src/test/java/entity/SpawningCreaturesTest.java @@ -6,6 +6,7 @@ import org.junit.Test; import electrosphere.engine.Globals; import electrosphere.engine.Main; +import electrosphere.engine.profiler.Profiler; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.net.NetUtils; import electrosphere.server.datacell.Realm; @@ -19,6 +20,7 @@ public class SpawningCreaturesTest { Globals.RUN_CLIENT = true; Globals.RUN_SERVER = true; Globals.HEADLESS = true; + Profiler.PROFILE = false; NetUtils.setPort(0); Main.startUp(); } diff --git a/src/test/java/startup/StartupTest.java b/src/test/java/startup/StartupTest.java index cb619a28..a44fe24e 100644 --- a/src/test/java/startup/StartupTest.java +++ b/src/test/java/startup/StartupTest.java @@ -3,6 +3,7 @@ import org.junit.Test; import electrosphere.engine.Globals; import electrosphere.engine.Main; +import electrosphere.engine.profiler.Profiler; import electrosphere.net.NetUtils; import junit.framework.TestCase; @@ -14,6 +15,7 @@ public class StartupTest extends TestCase { Globals.RUN_CLIENT = false; Globals.RUN_SERVER = true; Globals.HEADLESS = true; + Profiler.PROFILE = false; NetUtils.setPort(0); Main.startUp(); Main.mainLoop(1);