mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
113 lines
4.1 KiB
Diff
113 lines
4.1 KiB
Diff
From 8d325190904286d345de34c047d051565ee3fb6b 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 a473b2c6e..a5b4aed52 100644
|
|
--- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
|
|
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
|
|
@@ -16,11 +16,20 @@ 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)
|
|
{
|
|
+ // 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
|
|
@@ -38,9 +47,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.21.0
|
|
|