Skip to content

Commit c5e94cc

Browse files
committed
fix override for Cushion
1 parent bdab299 commit c5e94cc

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@
12311231
+ return this.removePassenger(passenger, false);
12321232
+ }
12331233
+
1234-
+ protected boolean removePassenger(final Entity passenger, final boolean suppressCancellation) { // CraftBukkit
1234+
+ protected boolean removePassenger(final Entity passenger, final boolean suppressCancellation) {
12351235
+ // Paper end - Force entity dismount during teleportation
12361236
if (passenger.getVehicle() == this) {
12371237
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");

‎paper-server/patches/sources/net/minecraft/world/entity/decoration/Cushion.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
- protected void removePassenger(final Entity passenger) {
88
- super.removePassenger(passenger);
99
+ // Paper start - Force entity dismount during teleportation
10-
+ protected boolean removePassenger(final Entity passenger) {
11-
+ if (!super.removePassenger(passenger)) {
10+
+ protected boolean removePassenger(final Entity passenger, final boolean suppressCancellation) {
11+
+ if (!super.removePassenger(passenger, suppressCancellation)) {
1212
+ return false;
1313
+ }
1414
+ // Paper end - Force entity dismount during teleportation

0 commit comments

Comments
 (0)