From a6bce7bfb44277c46ad949d6dff283240e56e1ce Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Tue, 5 Mar 2019 16:42:23 +1100
Subject: [PATCH] SPIGOT-4647: Properly cancel VehicleDamageEvent

By: md_5 <git@md-5.net>
---
 paper-server/nms-patches/EntityBoat.patch             | 2 +-
 paper-server/nms-patches/EntityMinecartAbstract.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/paper-server/nms-patches/EntityBoat.patch b/paper-server/nms-patches/EntityBoat.patch
index 8f6ab3b43..265b19a50 100644
--- a/paper-server/nms-patches/EntityBoat.patch
+++ b/paper-server/nms-patches/EntityBoat.patch
@@ -43,7 +43,7 @@
 +                this.world.getServer().getPluginManager().callEvent(event);
 +
 +                if (event.isCancelled()) {
-+                    return true;
++                    return false;
 +                }
 +                // f = event.getDamage(); // TODO Why don't we do this?
 +                // CraftBukkit end
diff --git a/paper-server/nms-patches/EntityMinecartAbstract.patch b/paper-server/nms-patches/EntityMinecartAbstract.patch
index d5ec05b2c..f875c4967 100644
--- a/paper-server/nms-patches/EntityMinecartAbstract.patch
+++ b/paper-server/nms-patches/EntityMinecartAbstract.patch
@@ -46,7 +46,7 @@
 +                this.world.getServer().getPluginManager().callEvent(event);
 +
 +                if (event.isCancelled()) {
-+                    return true;
++                    return false;
 +                }
 +
 +                f = (float) event.getDamage();