mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream CB

Browse source 
--- work/CraftBukkit
Submodule work/CraftBukkit e4183e70..f489f0f7:
  > SPIGOT-4494: Remove fix for SPIGOT-3864, better handled by SPIGOT-3879 fix
This commit is contained in:
Zach Brown 2018-11-21 21:49:47 -05:00
parent 65cc6ba7c4
commit 23a0b8c7bb
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
3 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Spigot-API-Patches/0167-Support-cancellation-supression-of-EntityDismount-Ve.patch → Spigot-API-Patches/0168-Support-cancellation-supression-of-EntityDismount-Ve.patch
View file

@ -1,4 +1,4 @@
From f1d6f2a88ce9419dcfc9ae177fd077c1e60c6eb6 Mon Sep 17 00:00:00 2001
From 9cc1d43c347c163357f283529d7fd0a9cefb5474 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
@ -21,7 +21,7 @@ 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 364451b56..b3269db2e 100644
index 364451b5..b3269db2 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
@@ -12,10 +12,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@ -64,7 +64,7 @@ index 364451b56..b3269db2e 100644
public HandlerList getHandlers() {
return handlers;
diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
index 4110d3bb2..555899efc 100644
index 4110d3bb..555899ef 100644
--- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
@@ -15,11 +15,20 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable