mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-21 20:34:51 +02:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
99 lines
2.7 KiB
Diff
99 lines
2.7 KiB
Diff
From 13ce91688059f9bc8beabdffaa96a6dafac1d328 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 28 Mar 2016 21:15:34 -0400
|
|
Subject: [PATCH] EntityPathfindEvent
|
|
|
|
Fires when an Entity decides to start moving to a location.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
|
|
new file mode 100644
|
|
index 000000000..63e46b2fb
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
|
|
@@ -0,0 +1,82 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Fired when an Entity decides to start moving towards a location.
|
|
+ *
|
|
+ * This event does not fire for the entities actual movement. Only when it
|
|
+ * is choosing to start moving to a location.
|
|
+ */
|
|
+public class EntityPathfindEvent extends EntityEvent implements Cancellable {
|
|
+ @Nullable private final Entity targetEntity;
|
|
+ @NotNull private final Location loc;
|
|
+
|
|
+ public EntityPathfindEvent(@NotNull Entity entity, @NotNull Location loc, @Nullable Entity targetEntity) {
|
|
+ super(entity);
|
|
+ this.targetEntity = targetEntity;
|
|
+ this.loc = loc;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The Entity that is pathfinding.
|
|
+ * @return The Entity that is pathfinding.
|
|
+ */
|
|
+ @NotNull
|
|
+ public Entity getEntity() {
|
|
+ return entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * If the Entity is trying to pathfind to an entity, this is the entity in relation.
|
|
+ *
|
|
+ * Otherwise this will return null.
|
|
+ *
|
|
+ * @return The entity target or null
|
|
+ */
|
|
+ @Nullable
|
|
+ public Entity getTargetEntity() {
|
|
+ return targetEntity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The Location of where the entity is about to move to.
|
|
+ *
|
|
+ * Note that if the target happened to of been an entity
|
|
+ * @return Location of where the entity is trying to pathfind to.
|
|
+ */
|
|
+ @NotNull
|
|
+ public Location getLoc() {
|
|
+ return loc;
|
|
+ }
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ private boolean cancelled = false;
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|