From 3e892f30ca05753b4ab70ac4980678ecc5e70c8f Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Wed, 21 Jul 2021 16:59:46 +0200 Subject: [PATCH] Remove requireNonNull and do safer --- src/main/java/com/volmit/iris/core/TreeManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/TreeManager.java b/src/main/java/com/volmit/iris/core/TreeManager.java index cd908d7b1..f9b19b0a1 100644 --- a/src/main/java/com/volmit/iris/core/TreeManager.java +++ b/src/main/java/com/volmit/iris/core/TreeManager.java @@ -42,12 +42,10 @@ public class TreeManager implements Listener { } // Get world access - IrisAccess worldAccess; - try { - worldAccess = Objects.requireNonNull(IrisToolbelt.access(event.getWorld())); - } catch (Throwable e) { + IrisAccess worldAccess = IrisToolbelt.access(event.getWorld()); + if (worldAccess == null){ Iris.debug(this.getClass().getName() + " passed it off to vanilla because could not get IrisAccess for this world"); - Iris.reportError(e); + Iris.reportError(new NullPointerException(event.getWorld().getName() + " could not be accessed despite being an Iris world")); return; }