mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01: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
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From f8bbb5a72a13662f0fea842d909b5a374ed6eef4 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sat, 9 Jun 2018 13:08:21 +0100
|
|
Subject: [PATCH] Add EntityTeleportEndGatewayEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
|
|
new file mode 100644
|
|
index 000000000..bfc69a43c
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
|
|
@@ -0,0 +1,31 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.block.EndGateway;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.entity.EntityTeleportEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Fired any time an entity attempts to teleport in an end gateway
|
|
+ */
|
|
+public class EntityTeleportEndGatewayEvent extends EntityTeleportEvent {
|
|
+
|
|
+ @NotNull private final EndGateway gateway;
|
|
+
|
|
+ public EntityTeleportEndGatewayEvent(@NotNull Entity what, @NotNull Location from, @NotNull Location to, @NotNull EndGateway gateway) {
|
|
+ super(what, from, to);
|
|
+ this.gateway = gateway;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The gateway triggering the teleport
|
|
+ *
|
|
+ * @return EndGateway used
|
|
+ */
|
|
+ @NotNull
|
|
+ public EndGateway getGateway() {
|
|
+ return gateway;
|
|
+ }
|
|
+
|
|
+}
|
|
--
|
|
2.21.0
|
|
|