Begin switching to JSpecify annotations (#11448)
* Begin switching to JSpecify annotations * more * fixes
This commit is contained in:
		
					parent
					
						
							
								fa1f6a5d78
							
						
					
				
			
			
				commit
				
					
						64e918335c
					
				
			
		
					 62 changed files with 580 additions and 750 deletions
				
			
		|  | @ -20,13 +20,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +import org.bukkit.event.entity.EntityEvent;
 | ||||
| +import org.bukkit.event.player.PlayerMoveEvent;
 | ||||
| +import org.jetbrains.annotations.ApiStatus;
 | ||||
| +import org.jetbrains.annotations.NotNull;
 | ||||
| +import org.jspecify.annotations.NullMarked;
 | ||||
| +
 | ||||
| +/**
 | ||||
| + * Holds information for living entity movement events
 | ||||
| + * <p>
 | ||||
| + * Does not fire for players; use {@link PlayerMoveEvent} for player movement.
 | ||||
| + */
 | ||||
| +@NullMarked
 | ||||
| +public class EntityMoveEvent extends EntityEvent implements Cancellable {
 | ||||
| +
 | ||||
| +    private static final HandlerList HANDLER_LIST = new HandlerList();
 | ||||
|  | @ -37,14 +38,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +    private boolean cancelled;
 | ||||
| +
 | ||||
| +    @ApiStatus.Internal
 | ||||
| +    public EntityMoveEvent(@NotNull LivingEntity entity, @NotNull Location from, @NotNull Location to) {
 | ||||
| +    public EntityMoveEvent(final LivingEntity entity, final Location from, final Location to) {
 | ||||
| +        super(entity);
 | ||||
| +        this.from = from;
 | ||||
| +        this.to = to;
 | ||||
| +    }
 | ||||
| +
 | ||||
| +    @Override
 | ||||
| +    @NotNull
 | ||||
| +    public LivingEntity getEntity() {
 | ||||
| +        return (LivingEntity) super.getEntity();
 | ||||
| +    }
 | ||||
|  | @ -54,7 +54,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +     *
 | ||||
| +     * @return Location the entity moved from
 | ||||
| +     */
 | ||||
| +    @NotNull
 | ||||
| +    public Location getFrom() {
 | ||||
| +        return this.from;
 | ||||
| +    }
 | ||||
|  | @ -64,8 +63,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +     *
 | ||||
| +     * @param from New location to mark as the entity's previous location
 | ||||
| +     */
 | ||||
| +    public void setFrom(@NotNull Location from) {
 | ||||
| +        validateLocation(from);
 | ||||
| +    public void setFrom(final Location from) {
 | ||||
| +        this.validateLocation(from);
 | ||||
| +        this.from = from;
 | ||||
| +    }
 | ||||
| +
 | ||||
|  | @ -74,7 +73,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +     *
 | ||||
| +     * @return Location the entity moved to
 | ||||
| +     */
 | ||||
| +    @NotNull
 | ||||
| +    public Location getTo() {
 | ||||
| +        return this.to;
 | ||||
| +    }
 | ||||
|  | @ -84,8 +82,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +     *
 | ||||
| +     * @param to New Location this entity will move to
 | ||||
| +     */
 | ||||
| +    public void setTo(@NotNull Location to) {
 | ||||
| +        validateLocation(to);
 | ||||
| +    public void setTo(final Location to) {
 | ||||
| +        this.validateLocation(to);
 | ||||
| +        this.to = to;
 | ||||
| +    }
 | ||||
| +
 | ||||
|  | @ -95,7 +93,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +     * @return whether the entity has changed position or not
 | ||||
| +     */
 | ||||
| +    public boolean hasChangedPosition() {
 | ||||
| +        return hasExplicitlyChangedPosition() || !this.from.getWorld().equals(this.to.getWorld());
 | ||||
| +        return this.hasExplicitlyChangedPosition() || !this.from.getWorld().equals(this.to.getWorld());
 | ||||
| +    }
 | ||||
| +
 | ||||
| +    /**
 | ||||
|  | @ -113,7 +111,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +     * @return whether the entity has moved to a new block or not
 | ||||
| +     */
 | ||||
| +    public boolean hasChangedBlock() {
 | ||||
| +        return hasExplicitlyChangedBlock() || !from.getWorld().equals(to.getWorld());
 | ||||
| +        return this.hasExplicitlyChangedBlock() || !this.from.getWorld().equals(this.to.getWorld());
 | ||||
| +    }
 | ||||
| +
 | ||||
| +    /**
 | ||||
|  | @ -134,7 +132,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +        return this.from.getPitch() != this.to.getPitch() || this.from.getYaw() != this.to.getYaw();
 | ||||
| +    }
 | ||||
| +
 | ||||
| +    private void validateLocation(@NotNull Location loc) {
 | ||||
| +    private void validateLocation(final Location loc) {
 | ||||
| +        Preconditions.checkArgument(loc != null, "Cannot use null location!");
 | ||||
| +        Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!");
 | ||||
| +    }
 | ||||
|  | @ -145,17 +143,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 | |||
| +    }
 | ||||
| +
 | ||||
| +    @Override
 | ||||
| +    public void setCancelled(boolean cancel) {
 | ||||
| +    public void setCancelled(final boolean cancel) {
 | ||||
| +        this.cancelled = cancel;
 | ||||
| +    }
 | ||||
| +
 | ||||
| +    @Override
 | ||||
| +    @NotNull
 | ||||
| +    public HandlerList getHandlers() {
 | ||||
| +        return HANDLER_LIST;
 | ||||
| +    }
 | ||||
| +
 | ||||
| +    @NotNull
 | ||||
| +    public static HandlerList getHandlerList() {
 | ||||
| +        return HANDLER_LIST;
 | ||||
| +    }
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Jake Potrebic
				Jake Potrebic