diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 7c4db051..734054f1 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -82,7 +82,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
         }
 
         World world = this.world.get();
-        return world != null && Bukkit.getWorld(world.getUID()) != null;
+        return world != null && world.equals(Bukkit.getWorld(world.getUID()));
     }
 
     /**
diff --git a/src/main/java/org/bukkit/inventory/view/AnvilView.java b/src/main/java/org/bukkit/inventory/view/AnvilView.java
index 0344b3db..8963fefa 100644
--- a/src/main/java/org/bukkit/inventory/view/AnvilView.java
+++ b/src/main/java/org/bukkit/inventory/view/AnvilView.java
@@ -1,6 +1,8 @@
 package org.bukkit.inventory.view;
 
+import org.bukkit.inventory.AnvilInventory;
 import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -9,6 +11,10 @@ import org.jetbrains.annotations.Nullable;
  */
 public interface AnvilView extends InventoryView {
 
+    @NotNull
+    @Override
+    AnvilInventory getTopInventory();
+
     /**
      * Gets the rename text specified within the anvil's text field.
      *
diff --git a/src/main/java/org/bukkit/inventory/view/BeaconView.java b/src/main/java/org/bukkit/inventory/view/BeaconView.java
index 46b26061..7abbd83b 100644
--- a/src/main/java/org/bukkit/inventory/view/BeaconView.java
+++ b/src/main/java/org/bukkit/inventory/view/BeaconView.java
@@ -1,7 +1,9 @@
 package org.bukkit.inventory.view;
 
+import org.bukkit.inventory.BeaconInventory;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -10,6 +12,10 @@ import org.jetbrains.annotations.Nullable;
  */
 public interface BeaconView extends InventoryView {
 
+    @NotNull
+    @Override
+    BeaconInventory getTopInventory();
+
     /**
      * Gets the tier of the beacon
      * <p>
diff --git a/src/main/java/org/bukkit/inventory/view/BrewingStandView.java b/src/main/java/org/bukkit/inventory/view/BrewingStandView.java
index 206e9bef..f76db275 100644
--- a/src/main/java/org/bukkit/inventory/view/BrewingStandView.java
+++ b/src/main/java/org/bukkit/inventory/view/BrewingStandView.java
@@ -1,6 +1,8 @@
 package org.bukkit.inventory.view;
 
+import org.bukkit.inventory.BrewerInventory;
 import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An instance of {@link InventoryView} which provides extra methods related to
@@ -8,6 +10,10 @@ import org.bukkit.inventory.InventoryView;
  */
 public interface BrewingStandView extends InventoryView {
 
+    @NotNull
+    @Override
+    BrewerInventory getTopInventory();
+
     /**
      * Gets the fuel level of this brewing stand.
      * <p>
diff --git a/src/main/java/org/bukkit/inventory/view/CrafterView.java b/src/main/java/org/bukkit/inventory/view/CrafterView.java
index 23456444..12fe2746 100644
--- a/src/main/java/org/bukkit/inventory/view/CrafterView.java
+++ b/src/main/java/org/bukkit/inventory/view/CrafterView.java
@@ -1,6 +1,8 @@
 package org.bukkit.inventory.view;
 
+import org.bukkit.inventory.CrafterInventory;
 import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An instance of {@link InventoryView} which provides extra methods related to
@@ -8,6 +10,10 @@ import org.bukkit.inventory.InventoryView;
  */
 public interface CrafterView extends InventoryView {
 
+    @NotNull
+    @Override
+    CrafterInventory getTopInventory();
+
     /**
      * Checks if the given crafter slot is disabled.
      *
diff --git a/src/main/java/org/bukkit/inventory/view/EnchantmentView.java b/src/main/java/org/bukkit/inventory/view/EnchantmentView.java
index e3471d50..18014f3a 100644
--- a/src/main/java/org/bukkit/inventory/view/EnchantmentView.java
+++ b/src/main/java/org/bukkit/inventory/view/EnchantmentView.java
@@ -1,6 +1,7 @@
 package org.bukkit.inventory.view;
 
 import org.bukkit.enchantments.EnchantmentOffer;
+import org.bukkit.inventory.EnchantingInventory;
 import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
  */
 public interface EnchantmentView extends InventoryView {
 
+    @NotNull
+    @Override
+    EnchantingInventory getTopInventory();
+
     /**
      * Gets the random enchantment seed used in this view
      *
diff --git a/src/main/java/org/bukkit/inventory/view/FurnaceView.java b/src/main/java/org/bukkit/inventory/view/FurnaceView.java
index 39704848..ac5acee3 100644
--- a/src/main/java/org/bukkit/inventory/view/FurnaceView.java
+++ b/src/main/java/org/bukkit/inventory/view/FurnaceView.java
@@ -1,7 +1,9 @@
 package org.bukkit.inventory.view;
 
 import org.bukkit.block.Furnace;
+import org.bukkit.inventory.FurnaceInventory;
 import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An instance of {@link InventoryView} which provides extra methods related to
@@ -9,6 +11,10 @@ import org.bukkit.inventory.InventoryView;
  */
 public interface FurnaceView extends InventoryView {
 
+    @NotNull
+    @Override
+    FurnaceInventory getTopInventory();
+
     /**
      * The cook time for this view.
      * <p>
diff --git a/src/main/java/org/bukkit/inventory/view/LecternView.java b/src/main/java/org/bukkit/inventory/view/LecternView.java
index 216c4ed1..f48c6884 100644
--- a/src/main/java/org/bukkit/inventory/view/LecternView.java
+++ b/src/main/java/org/bukkit/inventory/view/LecternView.java
@@ -1,6 +1,8 @@
 package org.bukkit.inventory.view;
 
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.LecternInventory;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * An instance of {@link InventoryView} which provides extra methods related to
@@ -8,6 +10,10 @@ import org.bukkit.inventory.InventoryView;
  */
 public interface LecternView extends InventoryView {
 
+    @NotNull
+    @Override
+    LecternInventory getTopInventory();
+
     /**
      * Gets the page that the LecternView is on.
      *
diff --git a/src/main/java/org/bukkit/inventory/view/LoomView.java b/src/main/java/org/bukkit/inventory/view/LoomView.java
index b37091f8..b5bf0d2a 100644
--- a/src/main/java/org/bukkit/inventory/view/LoomView.java
+++ b/src/main/java/org/bukkit/inventory/view/LoomView.java
@@ -3,6 +3,7 @@ package org.bukkit.inventory.view;
 import java.util.List;
 import org.bukkit.block.banner.PatternType;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.LoomInventory;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -11,6 +12,10 @@ import org.jetbrains.annotations.NotNull;
  */
 public interface LoomView extends InventoryView {
 
+    @NotNull
+    @Override
+    LoomInventory getTopInventory();
+
     /**
      * Gets a list of all selectable to the player.
      *
diff --git a/src/main/java/org/bukkit/inventory/view/MerchantView.java b/src/main/java/org/bukkit/inventory/view/MerchantView.java
index f7000f6c..8d45a7e5 100644
--- a/src/main/java/org/bukkit/inventory/view/MerchantView.java
+++ b/src/main/java/org/bukkit/inventory/view/MerchantView.java
@@ -2,6 +2,7 @@ package org.bukkit.inventory.view;
 
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.Merchant;
+import org.bukkit.inventory.MerchantInventory;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -10,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
  */
 public interface MerchantView extends InventoryView {
 
+    @NotNull
+    @Override
+    MerchantInventory getTopInventory();
+
     /**
      * Gets the merchant that this view is for.
      *
diff --git a/src/main/java/org/bukkit/inventory/view/StonecutterView.java b/src/main/java/org/bukkit/inventory/view/StonecutterView.java
index 4ff11fe7..9805ea5b 100644
--- a/src/main/java/org/bukkit/inventory/view/StonecutterView.java
+++ b/src/main/java/org/bukkit/inventory/view/StonecutterView.java
@@ -2,6 +2,7 @@ package org.bukkit.inventory.view;
 
 import java.util.List;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.StonecutterInventory;
 import org.bukkit.inventory.StonecuttingRecipe;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,6 +12,10 @@ import org.jetbrains.annotations.NotNull;
  */
 public interface StonecutterView extends InventoryView {
 
+    @NotNull
+    @Override
+    StonecutterInventory getTopInventory();
+
     /**
      * Gets the current index of the selected recipe.
      *