mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-28 23:49:41 +02:00
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
156 lines
4.7 KiB
Diff
156 lines
4.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Tue, 11 Feb 2020 21:56:38 -0600
|
|
Subject: [PATCH] EntityMoveEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityMoveEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityMoveEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..245d56ba7e8e37e3555b606f5e85fc663897f62b
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityMoveEvent.java
|
|
@@ -0,0 +1,143 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import com.google.common.base.Preconditions;
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.bukkit.event.player.PlayerMoveEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Holds information for living entity movement events
|
|
+ * <p>
|
|
+ * Does not fire for players; use {@link PlayerMoveEvent} for player movement.
|
|
+ */
|
|
+public class EntityMoveEvent extends EntityEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean canceled;
|
|
+ private Location from;
|
|
+ private Location to;
|
|
+
|
|
+ public EntityMoveEvent(@NotNull LivingEntity entity, @NotNull Location from, @NotNull Location to) {
|
|
+ super(entity);
|
|
+ this.from = from;
|
|
+ this.to = to;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @NotNull
|
|
+ public LivingEntity getEntity() {
|
|
+ return (LivingEntity) entity;
|
|
+ }
|
|
+
|
|
+ public boolean isCancelled() {
|
|
+ return canceled;
|
|
+ }
|
|
+
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ canceled = cancel;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the location this entity moved from
|
|
+ *
|
|
+ * @return Location the entity moved from
|
|
+ */
|
|
+ @NotNull
|
|
+ public Location getFrom() {
|
|
+ return from;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the location to mark as where the entity moved from
|
|
+ *
|
|
+ * @param from New location to mark as the entity's previous location
|
|
+ */
|
|
+ public void setFrom(@NotNull Location from) {
|
|
+ validateLocation(from);
|
|
+ this.from = from;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the location this entity moved to
|
|
+ *
|
|
+ * @return Location the entity moved to
|
|
+ */
|
|
+ @NotNull
|
|
+ public Location getTo() {
|
|
+ return to;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the location that this entity will move to
|
|
+ *
|
|
+ * @param to New Location this entity will move to
|
|
+ */
|
|
+ public void setTo(@NotNull Location to) {
|
|
+ validateLocation(to);
|
|
+ this.to = to;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the entity has changed position (even within the same block) in the event
|
|
+ *
|
|
+ * @return whether the entity has changed position or not
|
|
+ */
|
|
+ public boolean hasChangedPosition() {
|
|
+ return hasExplicitlyChangedPosition() || !from.getWorld().equals(to.getWorld());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the entity has changed position (even within the same block) in the event, disregarding a possible world change
|
|
+ *
|
|
+ * @return whether the entity has changed position or not
|
|
+ */
|
|
+ public boolean hasExplicitlyChangedPosition() {
|
|
+ return from.getX() != to.getX() || from.getY() != to.getY() || from.getZ() != to.getZ();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the entity has moved to a new block in the event
|
|
+ *
|
|
+ * @return whether the entity has moved to a new block or not
|
|
+ */
|
|
+ public boolean hasChangedBlock() {
|
|
+ return hasExplicitlyChangedBlock() || !from.getWorld().equals(to.getWorld());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the entity has moved to a new block in the event, disregarding a possible world change
|
|
+ *
|
|
+ * @return whether the entity has moved to a new block or not
|
|
+ */
|
|
+ public boolean hasExplicitlyChangedBlock() {
|
|
+ return from.getBlockX() != to.getBlockX() || from.getBlockY() != to.getBlockY() || from.getBlockZ() != to.getBlockZ();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the entity has changed orientation in the event
|
|
+ *
|
|
+ * @return whether the entity has changed orientation or not
|
|
+ */
|
|
+ public boolean hasChangedOrientation() {
|
|
+ return from.getPitch() != to.getPitch() || from.getYaw() != to.getYaw();
|
|
+ }
|
|
+
|
|
+ private void validateLocation(@NotNull Location loc) {
|
|
+ Preconditions.checkArgument(loc != null, "Cannot use null location!");
|
|
+ Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|