From dcdb42eadbb0befb3eeb3d77e73383ac61ef626f Mon Sep 17 00:00:00 2001
From: Hannes Greule <hannesgreule@outlook.de>
Date: Thu, 6 Aug 2020 23:53:24 +0200
Subject: [PATCH] Fix NPE on AbstractRegion#equals

---
 .../java/com/sk89q/worldedit/regions/AbstractRegion.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
index c33d371bd..9835ec3c4 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 public abstract class AbstractRegion extends AbstractSet<BlockVector3> implements Region {
@@ -226,12 +227,8 @@ public abstract class AbstractRegion extends AbstractSet<BlockVector3> implement
             return false;
         }
         Region region = ((Region) o);
-        if (this.getWorld() != region.getWorld()) {
-            if (this.getWorld() == null || region.getWorld() == null) {
-                return false;
-            }
-        }
-        if (this.getWorld().equals(region.getWorld())
+
+        if (Objects.equals(this.getWorld(), region.getWorld())
             && this.getMinimumPoint().equals(region.getMinimumPoint())
             && this.getMaximumPoint().equals(region.getMaximumPoint())
             && this.getVolume() == region.getVolume()) {