[ci skip] Minor cleanup and patch merges

This commit is contained in:
Nassim Jahnke
2024-01-16 19:27:39 +01:00
parent 22185798a5
commit 3a0aff9ba9
19 changed files with 166 additions and 236 deletions

View File

@@ -47,12 +47,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
public void setSitting(boolean sitting) {
+ // Paper start
+ // Paper start - Add EntityToggleSitEvent
+ 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;
+ // Paper end - Add EntityToggleSitEvent
+ // Paper end - Add EntityToggleSitEvent
this.setFlag(1, sitting);
}