FIXED: when we're loading world with MV in some cases we can get difficulty null and get crash server

funkyra · funkyra · commit 14a2cd3a1890 · 2025-09-22T18:14:22.000+03:00
diff --git a/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch b/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch
@@ -152,7 +152,13 @@
          this.field_76104_m = p_76084_1_;
      }
  
-@@ -709,6 +738,11 @@
+@@ -704,11 +733,16 @@
+ 
+     public EnumDifficulty func_176130_y()
+     {
+-        return this.field_176158_z;
++        return this.field_176158_z == null ? this.field_176158_z = MinecraftServer.getServerInst().func_147135_j() : this.field_176158_z;
+     }
  
      public void func_176144_a(EnumDifficulty p_176144_1_)
      {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,13 @@`
`152`	`152`	`this.field_76104_m = p_76084_1_;`
`153`	`153`	`}`
`154`	`154`
`155`		`-@@ -709,6 +738,11 @@`
	`155`	`+@@ -704,11 +733,16 @@`
	`156`	`+`
	`157`	`+ public EnumDifficulty func_176130_y()`
	`158`	`+ {`
	`159`	`+- return this.field_176158_z;`
	`160`	`++ return this.field_176158_z == null ? this.field_176158_z = MinecraftServer.getServerInst().func_147135_j() : this.field_176158_z;`
	`161`	`+ }`
`156`	`162`
`157`	`163`	`public void func_176144_a(EnumDifficulty p_176144_1_)`
`158`	`164`	`{`