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

Don't fire EntityToggleSitEvent on deserialization & reorder some api patches (#8495)

Browse source
This commit is contained in:
Owen 2022-10-22 22:55:28 -04:00 • committed by GitHub
parent 6665076342
commit 0b8f40cf6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

0
patches/api/0405-Add-EquipmentSlot-convenience-methods.patch → patches/api/0402-Add-EquipmentSlot-convenience-methods.patch
View file

0
patches/api/0402-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch → patches/api/0403-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
View file

2
patches/api/0403-Add-entity-knockback-API.patch → patches/api/0404-Add-entity-knockback-API.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 319e4571aca24d1e3f6c85b7435d65c0e77a5245..c9a44e8024f903da83181ee752c971bab22c8895 100644
index 435e214af7f09b3f1da078e6517cd14bb5ad2b87..3bd1d100d0c481ae7edaa251869640ab370aeb42 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1003,5 +1003,17 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

16
patches/api/0404-Added-EntityToggleSitEvent.patch → patches/api/0405-Added-EntityToggleSitEvent.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Added EntityToggleSitEvent
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityToggleSitEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityToggleSitEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..982dad1bae89e52d29343101c424797e00a2b229
index 0000000000000000000000000000000000000000..b53e9eb7df916721ad79925d711624b3da5619bb
--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/entity/EntityToggleSitEvent.java
@@ -0,0 +1,65 @@
@@ -0,0 +1,53 @@
+package io.papermc.paper.event.entity;
+
+import org.bukkit.entity.Entity;
@ -26,26 +26,14 @@ index 0000000000000000000000000000000000000000..982dad1bae89e52d29343101c424797e
+ private static final HandlerList HANDLER_LIST = new HandlerList();
+
+ private boolean cancelled;
+ private final Entity entity;
+ private final boolean isSitting;
+
+ public EntityToggleSitEvent(@NotNull Entity entity, boolean isSitting) {
+ super(entity);
+ this.entity = entity;
+ this.isSitting = isSitting;
+ }
+
+ /**
+ * The entity involved.
+ *
+ * @return The entity.
+ */
+ @NotNull
+ public Entity getEntity() {
+ return this.entity;
+ }
+
+ /**
+ * Gets the new sitting state that the entity will change to.
+ *
+ * @return If it's going to sit or not.