keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix that the Missing blocks/items/registries prompt often got stuck.

Browse source
This commit is contained in:
cpw 2016-06-25 01:07:45 -04:00
parent 006509a834
commit efbd21e3eb
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
View file

@ -85,3 +85,11 @@
return this.field_71349_l.field_71441_e.func_72912_H().func_176130_y(); return this.field_71349_l.field_71441_e.func_72912_H().func_176130_y();
} }
@@ -357,6 +336,7 @@
public void func_71263_m()
{
+ if (func_71278_l())
Futures.getUnchecked(this.func_152344_a(new Runnable()
{
public void run()

2
src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
View file

@ -656,7 +656,7 @@ public class FMLClientHandler implements IFMLSidedHandler
if (server != null && !server.serverIsInRunLoop()) if (server != null && !server.serverIsInRunLoop())
{ {
ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, true, "field_71296"+"_Q","serverIs"+"Running"); // ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, true, "field_71296"+"_Q","serverIs"+"Running");
} }
} }

3
src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
View file

@ -210,7 +210,10 @@ public class PersistentRegistryManager
boolean confirmed = StartupQuery.confirm(text); boolean confirmed = StartupQuery.confirm(text);
if (!confirmed) if (!confirmed)
{
StartupQuery.abort(); StartupQuery.abort();
;
}
} }
// Load the snapshot into the "STAGING" registry // Load the snapshot into the "STAGING" registry