3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 12:30:06 +01:00
Paper/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch

41 Zeilen
1.7 KiB
Diff

2015-09-01 10:07:28 +02:00
From b6dc057e61c507292b951a417232c665734cbe0b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
2015-09-01 10:07:28 +02:00
index 2f386ac..bf3ce15 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2015-09-01 10:07:28 +02:00
@@ -1541,6 +1541,7 @@ public abstract class Entity implements ICommandListener {
}
}
// CraftBukkit end
+ pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
2014-11-28 02:17:45 +01:00
this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
this.vehicle.passenger = null;
2014-11-28 02:17:45 +01:00
}
2015-09-01 10:07:28 +02:00
@@ -1575,6 +1576,18 @@ public abstract class Entity implements ICommandListener {
}
}
// CraftBukkit end
+ // Spigot Start
2014-11-28 02:17:45 +01:00
+ if ( entity.world.isChunkLoaded( (int) entity.locX >> 4, (int) entity.locZ >> 4, true ) )
+ {
+ org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent( this.getBukkitEntity(), entity.getBukkitEntity() );
+ pluginManager.callEvent( event );
+ if ( event.isCancelled() )
+ {
+ return;
+ }
+ }
+ // Spigot End
2014-11-28 02:17:45 +01:00
+
if (this.vehicle != null) {
this.vehicle.passenger = null;
2014-11-28 02:17:45 +01:00
}
--
2015-05-09 22:23:26 +02:00
2.1.4