Merge 1.16 into 1.18

embeddedt · embeddedt · commit 022367c8d64d · 2023-08-03T17:01:11.000-04:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java
@@ -34,7 +34,7 @@ private void recordReloadEnd(CallbackInfoReturnable<WorldStem> cir) {
 
     @Inject(method = "tick", at = @At("HEAD"))
     private void onClientTick(CallbackInfo ci) {
-        if(this.overlay == null) {
+        if(this.overlay == null && ModernFixClient.INSTANCE != null) {
             ModernFixClient.INSTANCE.onGameLaunchFinish();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private void recordReloadEnd(CallbackInfoReturnable<WorldStem> cir) {`
`34`	`34`
`35`	`35`	`@Inject(method = "tick", at = @At("HEAD"))`
`36`	`36`	`private void onClientTick(CallbackInfo ci) {`
`37`		`- if(this.overlay == null) {`
	`37`	`+ if(this.overlay == null && ModernFixClient.INSTANCE != null) {`
`38`	`38`	`ModernFixClient.INSTANCE.onGameLaunchFinish();`
`39`	`39`	`}`
`40`	`40`	`}`