Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-08 01:17:47 +01:00
Code Issues Projects Releases Wiki Activity

Add nullability for LivingEntity methods (#1668)

Browse Source
This commit is contained in:
emortaldev 2023-01-08 03:10:53 +00:00 committed by GitHub
parent aa621021e2
commit 84846f663b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minestom/server/entity/LivingEntity.java
View File

@ -422,8 +422,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
* *
* @return the last damage source, null if not any * @return the last damage source, null if not any
*/ */
@Nullable public @Nullable DamageType getLastDamageSource() {
public DamageType getLastDamageSource() {
return lastDamageSource; return lastDamageSource;
} }
@ -626,7 +625,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
* *
* @param team The new team * @param team The new team
*/ */
public void setTeam(Team team) { public void setTeam(@Nullable Team team) {
if (this.team == team) return; if (this.team == team) return;
String member = this instanceof Player player ? player.getUsername() : uuid.toString(); String member = this instanceof Player player ? player.getUsername() : uuid.toString();
if (this.team != null) { if (this.team != null) {
@ -643,7 +642,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
* *
* @return the {@link Team} * @return the {@link Team}
*/ */
public Team getTeam() { public @Nullable Team getTeam() {
return team; return team;
} }
@ -653,7 +652,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
* @param maxDistance The max distance to scan before returning null * @param maxDistance The max distance to scan before returning null
* @return The block position targeted by this entity, null if non are found * @return The block position targeted by this entity, null if non are found
*/ */
public Point getTargetBlockPosition(int maxDistance) { public @Nullable Point getTargetBlockPosition(int maxDistance) {
Iterator<Point> it = new BlockIterator(this, maxDistance); Iterator<Point> it = new BlockIterator(this, maxDistance);
while (it.hasNext()) { while (it.hasNext()) {
final Point position = it.next(); final Point position = it.next();
@ -667,7 +666,7 @@ public class LivingEntity extends Entity implements EquipmentHandler {
* *
* @return null if meta of this entity does not inherit {@link LivingEntityMeta}, casted value otherwise. * @return null if meta of this entity does not inherit {@link LivingEntityMeta}, casted value otherwise.
*/ */
public LivingEntityMeta getLivingEntityMeta() { public @Nullable LivingEntityMeta getLivingEntityMeta() {
if (this.entityMeta instanceof LivingEntityMeta) { if (this.entityMeta instanceof LivingEntityMeta) {
return (LivingEntityMeta) this.entityMeta; return (LivingEntityMeta) this.entityMeta;
} }