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

Merge pull request #2592 from matthewprenger/patch-1

Browse source 
Pass exceptions thrown in mod event buses back to FML to handle appropriately
This commit is contained in:
LexManos 2016-03-21 19:39:09 -07:00
commit ac44fe298a
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/net/minecraftforge/fml/common/LoadController.java
View file

@ -44,6 +44,8 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.common.eventbus.SubscriberExceptionHandler;
import com.google.common.eventbus.SubscriberExceptionContext;
public class LoadController public class LoadController
{ {
@ -88,10 +90,18 @@ public class LoadController
{ {
Builder<String, EventBus> eventBus = ImmutableMap.builder(); Builder<String, EventBus> eventBus = ImmutableMap.builder();
for (ModContainer mod : loader.getModList()) for (final ModContainer mod : loader.getModList())
{ {
//Create mod logger, and make the EventBus logger a child of it. //Create mod logger, and make the EventBus logger a child of it.
EventBus bus = new EventBus(mod.getModId()); EventBus bus = new EventBus(new SubscriberExceptionHandler()
{
@Override
public void handleException(final Throwable exception, final SubscriberExceptionContext context)
{
LoadController.this.errorOccurred(mod, exception);
}
});
boolean isActive = mod.registerBus(bus, this); boolean isActive = mod.registerBus(bus, this);
if (isActive) if (isActive)
{ {