2022-10-23 00:20:52 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: KyGuy2002 <IEatBeans#1165>
Date: Fri, 11 Mar 2022 15:33:10 +0000
2024-01-16 12:41:40 +01:00
Subject: [PATCH] Add EntityToggleSitEvent
2022-10-23 00:20:52 +02:00
diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
2024-01-16 12:41:40 +01:00
index 1999cda5876bb12283d8c91a1b3e737c0d27bc38..4d32db04040014dba8935d1cb601e0da1a5d5b02 100644
2022-10-23 00:20:52 +02:00
--- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
+++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
2022-10-23 04:55:28 +02:00
@@ -67,7 +67,7 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
}
this.orderedToSit = nbt.getBoolean("Sitting");
- this.setInSittingPose(this.orderedToSit);
2024-01-16 12:41:40 +01:00
+ this.setInSittingPose(this.orderedToSit, false); // Paper - Add EntityToggleSitEvent
2022-10-23 04:55:28 +02:00
}
@Override
@@ -125,6 +125,12 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
2022-10-23 00:20:52 +02:00
}
public void setInSittingPose(boolean inSittingPose) {
2024-01-16 12:41:40 +01:00
+ // Paper start - Add EntityToggleSitEvent
2022-10-23 04:55:28 +02:00
+ this.setInSittingPose(inSittingPose, true);
+ }
+ public void setInSittingPose(boolean inSittingPose, boolean callEvent) {
2024-01-16 12:41:40 +01:00
+ if (callEvent && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), inSittingPose).callEvent()) return;
+ // Paper end - Add EntityToggleSitEvent
2022-10-23 00:20:52 +02:00
byte b = this.entityData.get(DATA_FLAGS_ID);
if (inSittingPose) {
this.entityData.set(DATA_FLAGS_ID, (byte)(b | 1));
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
2024-01-16 12:41:40 +01:00
index 96799179b0dd1886f0cdc386f04e152a19b3337d..a1c28f9590908df5dd9d850dd3f0cadbe83b05c6 100644
2022-10-23 00:20:52 +02:00
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
2023-09-22 17:51:48 +02:00
@@ -433,7 +433,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
2022-10-23 04:55:28 +02:00
this.setSleeping(nbt.getBoolean("Sleeping"));
2022-12-07 23:05:32 +01:00
this.setVariant(Fox.Type.byName(nbt.getString("Type")));
2022-10-23 04:55:28 +02:00
- this.setSitting(nbt.getBoolean("Sitting"));
2024-01-16 12:41:40 +01:00
+ this.setSitting(nbt.getBoolean("Sitting"), false); // Paper - Add EntityToggleSitEvent
2022-10-23 04:55:28 +02:00
this.setIsCrouching(nbt.getBoolean("Crouching"));
2023-06-08 10:47:19 +02:00
if (this.level() instanceof ServerLevel) {
2022-10-23 04:55:28 +02:00
this.setTargetGoals();
2023-09-22 17:51:48 +02:00
@@ -446,6 +446,12 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
2022-10-23 00:20:52 +02:00
}
public void setSitting(boolean sitting) {
2024-01-16 12:41:40 +01:00
+ // Paper start
2022-10-23 04:55:28 +02:00
+ this.setSitting(sitting, true);
+ }
+ public void setSitting(boolean sitting, boolean fireEvent) {
+ if (fireEvent && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), sitting).callEvent()) return;
2024-01-16 12:41:40 +01:00
+ // Paper end - Add EntityToggleSitEvent
2022-10-23 00:20:52 +02:00
this.setFlag(1, sitting);
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
2024-01-16 12:41:40 +01:00
index 130761afcaa6723e0a9d9a518f1b526c344484b4..25a7602670b9f736b3b9ff4523bc867e65c0998a 100644
2022-10-23 00:20:52 +02:00
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
2023-09-22 17:51:48 +02:00
@@ -138,6 +138,7 @@ public class Panda extends Animal {
2022-10-23 00:20:52 +02:00
}
public void sit(boolean sitting) {
2024-01-16 12:41:40 +01:00
+ if (!new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), sitting).callEvent()) return; // Paper - Add EntityToggleSitEvent
2022-10-23 00:20:52 +02:00
this.setFlag(8, sitting);
}
2023-03-15 15:37:41 +01:00
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
2024-01-16 12:41:40 +01:00
index faf3e31f23d71bbc345bf98d4240490ac4677843..17cff1a4657f688ed704404f76f6ceead3be3be1 100644
2023-03-15 15:37:41 +01:00
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
2023-09-22 17:51:48 +02:00
@@ -556,7 +556,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
2023-03-15 15:37:41 +01:00
}
public void sitDown() {
- if (!this.isCamelSitting()) {
2024-01-16 12:41:40 +01:00
+ if (!this.isCamelSitting() && new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), true).callEvent()) { // Paper - Add EntityToggleSitEvent
2023-09-22 17:51:48 +02:00
this.playSound(SoundEvents.CAMEL_SIT, 1.0F, this.getVoicePitch());
2023-03-15 15:37:41 +01:00
this.setPose(Pose.SITTING);
2023-09-22 17:51:48 +02:00
this.gameEvent(GameEvent.ENTITY_ACTION);
@@ -565,7 +565,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
2023-03-15 15:37:41 +01:00
}
public void standUp() {
- if (this.isCamelSitting()) {
2024-01-16 12:41:40 +01:00
+ if (this.isCamelSitting() && new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), false).callEvent()) { // Paper - Add EntityToggleSitEvent
2023-09-22 17:51:48 +02:00
this.playSound(SoundEvents.CAMEL_STAND, 1.0F, this.getVoicePitch());
2023-03-15 15:37:41 +01:00
this.setPose(Pose.STANDING);
2023-09-22 17:51:48 +02:00
this.gameEvent(GameEvent.ENTITY_ACTION);
@@ -574,6 +574,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
2023-03-15 15:37:41 +01:00
}
2023-06-08 10:47:19 +02:00
public void standUpInstantly() {
2024-01-16 12:41:40 +01:00
+ if (this.isCamelSitting() && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), false).callEvent()) return; // Paper - Add EntityToggleSitEvent
2023-03-15 15:37:41 +01:00
this.setPose(Pose.STANDING);
2023-09-22 17:51:48 +02:00
this.gameEvent(GameEvent.ENTITY_ACTION);
2023-06-08 10:47:19 +02:00
this.resetLastPoseChangeTickToFullStand(this.level().getGameTime());