mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +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
108 lines
2.8 KiB
Diff
108 lines
2.8 KiB
Diff
From d96ebed54e0dba4494e787925a687fccc4711042 Mon Sep 17 00:00:00 2001
|
|
From: Anthony MacAllister <anthonymmacallister@gmail.com>
|
|
Date: Thu, 26 Jul 2018 15:28:53 -0400
|
|
Subject: [PATCH] EntityTransformedEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
|
|
new file mode 100644
|
|
index 000000000..12194f1fc
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
|
|
@@ -0,0 +1,92 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.bukkit.event.entity.EntityTransformEvent;
|
|
+
|
|
+/**
|
|
+ * Fired when an entity transforms into another entity
|
|
+ * <p>
|
|
+ * If the event is cancelled, the entity will not transform
|
|
+ * @deprecated Bukkit has added {@link EntityTransformEvent}, you should start using that
|
|
+ */
|
|
+@Deprecated
|
|
+public class EntityTransformedEvent extends EntityEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private final Entity transformed;
|
|
+ private final TransformedReason reason;
|
|
+
|
|
+ public EntityTransformedEvent(Entity entity, Entity transformed, TransformedReason reason) {
|
|
+ super(entity);
|
|
+ this.transformed = transformed;
|
|
+ this.reason = reason;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The entity after it has transformed
|
|
+ *
|
|
+ * @return Transformed entity
|
|
+ * @deprecated see {@link EntityTransformEvent#getTransformedEntity()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public Entity getTransformed() {
|
|
+ return transformed;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return The reason for the transformation
|
|
+ * @deprecated see {@link EntityTransformEvent#getTransformReason()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public TransformedReason getReason() {
|
|
+ return reason;
|
|
+ }
|
|
+
|
|
+
|
|
+ @Override
|
|
+ public HandlerList getHandlers(){
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList(){
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled(){
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel){
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ public enum TransformedReason {
|
|
+ /**
|
|
+ * When a zombie drowns
|
|
+ */
|
|
+ DROWNED,
|
|
+ /**
|
|
+ * When a zombie villager is cured
|
|
+ */
|
|
+ CURED,
|
|
+ /**
|
|
+ * When a villager turns to a zombie villager
|
|
+ */
|
|
+ INFECTED,
|
|
+ /**
|
|
+ * When a mooshroom turns to a cow
|
|
+ */
|
|
+ SHEARED,
|
|
+ /**
|
|
+ * When a pig turns to a zombiepigman
|
|
+ */
|
|
+ LIGHTNING
|
|
+
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|