From f102d882996f7409efc2a0cc5e70a583d901097d Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 5 Mar 2019 16:42:23 +1100 Subject: [PATCH] SPIGOT-4647: Properly cancel VehicleDamageEvent --- nms-patches/EntityBoat.patch | 2 +- nms-patches/EntityMinecartAbstract.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nms-patches/EntityBoat.patch b/nms-patches/EntityBoat.patch index 8f6ab3b43d..265b19a508 100644 --- a/nms-patches/EntityBoat.patch +++ b/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/nms-patches/EntityMinecartAbstract.patch b/nms-patches/EntityMinecartAbstract.patch index d5ec05b2c9..f875c49676 100644 --- a/nms-patches/EntityMinecartAbstract.patch +++ b/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();