2020-02-09 05:19:54 +01:00
From 07e962c0cdaba87e8ad7cd0f076486975cf1519f Mon Sep 17 00:00:00 2001
2018-11-15 15:29:04 +01:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 15 Nov 2018 13:38:37 +0000
Subject: [PATCH] force entity dismount during teleportation
Entities must be dismounted before teleportation in order to avoid
2018-11-18 16:39:28 +01:00
multiple issues in the server with regards to teleportation, shamefully,
too many plugins rely on the events firing, which means that not firing
these events caues more issues than it solves;
2018-11-15 15:29:04 +01:00
2018-11-18 16:39:28 +01:00
In order to counteract this, Entity dismount/exit vehicle events have
been modified to supress cancellation (and has a method to allow plugins
to check if this has been set), noting that cancellation will be silently
surpressed given that plugins are not expecting this event to not be cancellable.
This is a far from ideal scenario, however: given the current state of this
event and other alternatives causing issues elsewhere, I believe that
this is going to be the best soultion all around.
Improvements/suggestions welcome!
2018-11-15 15:29:04 +01:00
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
2020-02-09 05:19:54 +01:00
index 7ce0ed251..508093063 100644
2018-11-15 15:29:04 +01:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2020-02-09 05:19:54 +01:00
@@ -2028,12 +2028,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2018-11-15 15:29:04 +01:00
}
- public void stopRiding() {
+ // Paper start
+ public void stopRiding() { stopRiding(false); }
2018-11-18 16:39:28 +01:00
+ public void stopRiding(boolean suppressCancellation) {
2018-11-15 15:29:04 +01:00
+ // Paper end
if (this.vehicle != null) {
Entity entity = this.vehicle;
this.vehicle = null;
- if (!entity.removePassenger(this)) this.vehicle = entity; // CraftBukkit
2018-11-18 16:39:28 +01:00
+ if (!entity.removePassenger(this, suppressCancellation)) this.vehicle = entity; // CraftBukkit // Paper
2018-11-15 15:29:04 +01:00
}
}
2020-02-09 05:19:54 +01:00
@@ -2084,7 +2087,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2018-11-15 15:29:04 +01:00
return true; // CraftBukkit
}
- protected boolean removePassenger(Entity entity) { // CraftBukkit
+ // Paper start
+ protected boolean removePassenger(Entity entity) { return removePassenger(entity, false);}
2018-11-18 16:39:28 +01:00
+ protected boolean removePassenger(Entity entity, boolean suppressCancellation) { // CraftBukkit
2018-11-15 15:29:04 +01:00
+ // Paper end
if (entity.getVehicle() == this) {
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
} else {
2020-02-09 05:19:54 +01:00
@@ -2094,7 +2100,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2018-11-18 16:39:28 +01:00
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
VehicleExitEvent event = new VehicleExitEvent(
(Vehicle) getBukkitEntity(),
- (LivingEntity) entity.getBukkitEntity()
+ (LivingEntity) entity.getBukkitEntity(), !suppressCancellation // Paper
);
Bukkit.getPluginManager().callEvent(event);
CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
2020-02-09 05:19:54 +01:00
@@ -2105,7 +2111,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2018-11-18 16:39:28 +01:00
}
// CraftBukkit end
// Spigot start
- org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity());
+ org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity(), !suppressCancellation); // Paper
Bukkit.getPluginManager().callEvent(event);
2018-11-15 15:29:04 +01:00
if (event.isCancelled()) {
return false;
2018-11-28 05:18:34 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
2020-02-09 05:19:54 +01:00
index 308ac18f7..584166f22 100644
2018-11-28 05:18:34 +01:00
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
2019-12-12 17:20:43 +01:00
@@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving {
2018-11-28 05:18:34 +01:00
return -0.35D;
}
2019-05-05 13:12:32 +02:00
- @Override
2018-11-28 05:18:34 +01:00
- public void stopRiding() {
- super.stopRiding();
+ // Paper start
2019-05-05 13:12:32 +02:00
+ @Override public void stopRiding() { stopRiding(false); }
+ @Override public void stopRiding(boolean suppressCancellation) {
+ // Paper end
2018-11-28 05:18:34 +01:00
+ super.stopRiding(suppressCancellation); // Paper - suppress
2019-05-05 13:12:32 +02:00
this.j = 0;
2018-11-28 05:18:34 +01:00
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
2020-02-09 05:19:54 +01:00
index eed3e7c58..4e64a80a8 100644
2018-11-28 05:18:34 +01:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2020-01-22 03:02:07 +01:00
@@ -2735,11 +2735,13 @@ public abstract class EntityLiving extends Entity {
2019-12-12 17:20:43 +01:00
return ((Byte) this.datawatcher.get(EntityLiving.ao) & 4) != 0;
2018-11-28 05:18:34 +01:00
}
2019-05-05 13:12:32 +02:00
- @Override
2018-11-28 05:18:34 +01:00
- public void stopRiding() {
+ // Paper start
2019-05-05 13:12:32 +02:00
+ @Override public void stopRiding() { stopRiding(false); }
+ @Override public void stopRiding(boolean suppressCancellation) {
2018-11-28 05:18:34 +01:00
+ // Paper end
Entity entity = this.getVehicle();
- super.stopRiding();
+ super.stopRiding(suppressCancellation); // Paper - suppress
if (entity != null && entity != this.getVehicle() && !this.world.isClientSide) {
2019-12-12 17:20:43 +01:00
this.a(entity);
2018-11-28 05:18:34 +01:00
}
2018-11-15 15:29:04 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
2020-02-09 05:19:54 +01:00
index f33580f8c..68e12cf98 100644
2018-11-15 15:29:04 +01:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2020-01-28 01:16:53 +01:00
@@ -1019,11 +1019,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2018-11-15 15:29:04 +01:00
}
}
2019-05-05 13:12:32 +02:00
- @Override
2018-11-15 15:29:04 +01:00
- public void stopRiding() {
+ // Paper start
2019-05-05 13:12:32 +02:00
+ @Override public void stopRiding() { stopRiding(false); }
+ @Override public void stopRiding(boolean suppressCancellation) {
+ // paper end
2018-11-15 15:29:04 +01:00
Entity entity = this.getVehicle();
- super.stopRiding();
2018-11-18 16:39:28 +01:00
+ super.stopRiding(suppressCancellation); // Paper
2018-11-15 15:29:04 +01:00
Entity entity1 = this.getVehicle();
if (entity1 != entity && this.playerConnection != null) {
--
2020-02-09 05:19:54 +01:00
2.25.0
2018-11-15 15:29:04 +01:00