From f997aee8917176d39d92bd80aea1ff6cbcc452fb Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 14 Apr 2019 08:49:26 -0700 Subject: [PATCH] Fix crash on world unload Don't know how to reproduce, but this will make sure we don't call clear on null --- .../util/handler/event/GenericHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index d1431db8..7d094f3e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -475,11 +475,11 @@ public class GenericHandler { @SubscribeEvent public static void onWorldUnload(WorldEvent.Unload event) { World world = event.getWorld(); - bounceMapMap.get(world).clear(); - filledHandMapMap.get(world).clear(); - attackTaskMapMap.get(world).clear(); - targetTaskMapMap.get(world).clear(); - PotionEventHandlers.flightListMap.get(world).clear(); - PotionEventHandlers.noGravityListMap.get(world).clear(); + bounceMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + filledHandMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + attackTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + targetTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); + PotionEventHandlers.flightListMap.getOrDefault(world, Collections.emptyList()).clear(); + PotionEventHandlers.noGravityListMap.getOrDefault(world, Collections.emptyList()).clear(); } }