mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source 
--- work/Bukkit
Submodule work/Bukkit 3aee9dbd0..0828ce366:
  > Add SpawnReason.SHEARING
  > SPIGOT-4339: Add EntityTransformEvent

--- work/CraftBukkit
Submodule work/CraftBukkit 17ff1e046..c2035aa1d:
  > Add some missing CreatureSpawnEvent.SpawnReason calls
  > SPIGOT-4339: Add EntityTransformEvent

--- work/Spigot
Submodule work/Spigot 947a8e7fd..5696c83c1:
  > Rebuild patches
This commit is contained in:
Zach Brown 2018-11-13 23:21:32 -05:00
parent 7c8937d0c6
commit 0ae3b1c14e
23 changed files with 264 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Spigot-API-Patches/0125-EntityTransformedEvent.patch
View file

@ -1,4 +1,4 @@
From dc559042b4464ebcd414f6160768d15753e49a12 Mon Sep 17 00:00:00 2001
From 5209ff5cba1819570522bccc6319375b8c531146 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
@ -6,10 +6,10 @@ 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..d9e5cab95
index 00000000..12194f1f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
@@ -0,0 +1,85 @@
@@ -0,0 +1,92 @@
+package com.destroystokyo.paper.event.entity;
+
+
@ -17,12 +17,15 @@ index 000000000..d9e5cab95
+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;
@ -39,14 +42,18 @@ index 000000000..d9e5cab95
+ * 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;
+ }
@ -96,5 +103,5 @@ index 000000000..d9e5cab95
+ }
+}
--
2.19.0
2.17.1