mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-25 02:17:35 +01:00
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
113 lines
4.1 KiB
Diff
113 lines
4.1 KiB
Diff
From 8410be584674d595e9083950b84c74e5f880383b Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sun, 18 Nov 2018 15:53:43 +0000
|
|
Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
|
|
events"
|
|
|
|
Entities must be dismounted before teleportation in order to avoid
|
|
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;
|
|
|
|
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!
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
|
|
index 963b9ead4..a976c32de 100644
|
|
--- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
|
|
@@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private boolean cancelled;
|
|
private final LivingEntity exited;
|
|
+ private final boolean isCancellable; // Paper
|
|
|
|
- public VehicleExitEvent(@NotNull final Vehicle vehicle, @NotNull final LivingEntity exited) {
|
|
+ public VehicleExitEvent(@NotNull final Vehicle vehicle, @NotNull final LivingEntity exited, boolean isCancellable) { // Paper
|
|
super(vehicle);
|
|
this.exited = exited;
|
|
+ // Paper start
|
|
+ this.isCancellable = isCancellable;
|
|
+ }
|
|
+
|
|
+ public VehicleExitEvent(@NotNull final Vehicle vehicle, @NotNull final LivingEntity exited) {
|
|
+ this(vehicle, exited, true);
|
|
+ // Paper end
|
|
}
|
|
|
|
/**
|
|
@@ -36,9 +44,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
|
|
|
|
@Override
|
|
public void setCancelled(boolean cancel) {
|
|
+ // Paper start
|
|
+ if (cancel && !isCancellable) {
|
|
+ return;
|
|
+ }
|
|
this.cancelled = cancel;
|
|
}
|
|
|
|
+ public boolean isCancellable() {
|
|
+ return isCancellable;
|
|
+ // paper end
|
|
+ }
|
|
+
|
|
@NotNull
|
|
@Override
|
|
public HandlerList getHandlers() {
|
|
diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
|
|
index 00d8ec81b..a7632c8f5 100644
|
|
--- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
|
|
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
|
|
@@ -14,10 +14,19 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private boolean cancelled;
|
|
private final Entity dismounted;
|
|
+ private final boolean isCancellable; // Paper
|
|
|
|
public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted) {
|
|
- super(what);
|
|
+ // Paper start
|
|
+ this(what, dismounted, true);
|
|
+ }
|
|
+
|
|
+
|
|
+ public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted, boolean isCancellable) {
|
|
+ // Paper end
|
|
+ super( what );
|
|
this.dismounted = dismounted;
|
|
+ this.isCancellable = isCancellable; // Paper
|
|
}
|
|
|
|
@NotNull
|
|
@@ -32,9 +41,18 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable {
|
|
|
|
@Override
|
|
public void setCancelled(boolean cancel) {
|
|
+ // Paper start
|
|
+ if (cancel && !isCancellable) {
|
|
+ return;
|
|
+ }
|
|
this.cancelled = cancel;
|
|
}
|
|
|
|
+ public boolean isCancellable() {
|
|
+ return isCancellable;
|
|
+ // Paper end
|
|
+ }
|
|
+
|
|
@NotNull
|
|
@Override
|
|
public HandlerList getHandlers() {
|
|
--
|
|
2.25.1
|
|
|