mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
Fix upstream nullability on entity equipment getters (#6519)
This commit is contained in:
parent
35ff5adaa2
commit
ac4b9756ce
@ -95,5 +95,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ */
|
+ */
|
||||||
+ int getMaxHeadPitch();
|
+ int getMaxHeadPitch();
|
||||||
// Paper end
|
// Paper end
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Instructs this Mob to set the specified LivingEntity as its target.
|
||||||
|
@ -41,5 +41,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ */
|
+ */
|
||||||
+ boolean isInDaylight();
|
+ boolean isInDaylight();
|
||||||
// Paper end
|
// Paper end
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Instructs this Mob to set the specified LivingEntity as its target.
|
||||||
|
@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
|
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
|
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
|
||||||
@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
|
@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
|
||||||
* @param move {@code true} if this armour stand can move, {@code false} otherwise
|
|
||||||
*/
|
@Override
|
||||||
void setCanMove(boolean move);
|
org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Tests if this armor stand can tick.
|
+ * Tests if this armor stand can tick.
|
||||||
|
@ -31,6 +31,50 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
*
|
*
|
||||||
* @return an array containing all previous players
|
* @return an array containing all previous players
|
||||||
*/
|
*/
|
||||||
|
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
|
||||||
|
@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
|
||||||
|
* @param move {@code true} if this armour stand can move, {@code false} otherwise
|
||||||
|
*/
|
||||||
|
void setCanMove(boolean move);
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
|
||||||
|
// Paper end
|
||||||
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
||||||
|
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
|
||||||
|
*/
|
||||||
|
public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder {
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ @Override
|
||||||
|
+ org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Returns the name of this player
|
||||||
|
*
|
||||||
|
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/Mob.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/Mob.java
|
||||||
|
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
|
||||||
|
*/
|
||||||
|
public interface Mob extends LivingEntity, Lootable {
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ @Override
|
||||||
|
+ org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment();
|
||||||
|
+ // Paper end
|
||||||
|
/**
|
||||||
|
* Instructs this Mob to set the specified LivingEntity as its target.
|
||||||
|
* <p>
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
|
@ -241,19 +241,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
|
@@ -0,0 +0,0 @@ public interface Mob extends LivingEntity, Lootable {
|
||||||
*/
|
// Paper start
|
||||||
public interface Mob extends LivingEntity, Lootable {
|
@Override
|
||||||
|
org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment();
|
||||||
+ // Paper start
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Enables access to control the pathing of an Entity
|
+ * Enables access to control the pathing of an Entity
|
||||||
+ * @return Pathfinding Manager for this entity
|
+ * @return Pathfinding Manager for this entity
|
||||||
+ */
|
+ */
|
||||||
+ @NotNull
|
+ @NotNull
|
||||||
+ com.destroystokyo.paper.entity.Pathfinder getPathfinder();
|
+ com.destroystokyo.paper.entity.Pathfinder getPathfinder();
|
||||||
+ // Paper end
|
// Paper end
|
||||||
+
|
|
||||||
/**
|
/**
|
||||||
* Instructs this Mob to set the specified LivingEntity as its target.
|
* Instructs this Mob to set the specified LivingEntity as its target.
|
||||||
* <p>
|
|
||||||
|
Loading…
Reference in New Issue
Block a user