spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-04-13 09:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into new-api/poi

Browse source
This commit is contained in:
Miles Holder 2024-10-06 14:05:12 -05:00
commit 9d7a90f3a3
No known key found for this signature in database
GPG key ID: B9CBACC92C5C094C
11 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/bukkit/Location.java
View file

@ -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()));
}
/**

6
src/main/java/org/bukkit/inventory/view/AnvilView.java
View file

@ -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.
*

6
src/main/java/org/bukkit/inventory/view/BeaconView.java
View file

@ -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>

6
src/main/java/org/bukkit/inventory/view/BrewingStandView.java
View file

@ -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>

6
src/main/java/org/bukkit/inventory/view/CrafterView.java
View file

@ -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.
*

5
src/main/java/org/bukkit/inventory/view/EnchantmentView.java
View file

@ -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
*

6
src/main/java/org/bukkit/inventory/view/FurnaceView.java
View file

@ -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>

6
src/main/java/org/bukkit/inventory/view/LecternView.java
View file

@ -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.
*

5
src/main/java/org/bukkit/inventory/view/LoomView.java
View file

@ -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.
*

5
src/main/java/org/bukkit/inventory/view/MerchantView.java
View file

@ -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.
*

5
src/main/java/org/bukkit/inventory/view/StonecutterView.java
View file

@ -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.
*