SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EntityDismountEvent and VehicleExitEvent cancellation

Browse Source 
Perhaps "workaround" would be the better term
This commit is contained in:
Zach Brown
2016-04-22 15:45:22 -05:00
parent ebff483051
commit 1ed12cfca6
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Spigot-Server-Patches/Made-EntityDismountEvent-Cancellable.patch
View File

@@ -14,7 +14,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// CraftBukkit end
- Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
+ // Paper start - make EntityDismountEvent cancellable
+ if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) return;
+ if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) {
+ if (entity instanceof EntityPlayer) {
+ ((EntityPlayer) entity).playerConnection.sendPacket(new net.minecraft.server.PacketPlayOutMount(this));
+ }
+ return;
+ }
+ // Paper end
this.passengers.remove(entity);
entity.j = 60;