19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
112 lines
2.6 KiB
Diff
112 lines
2.6 KiB
Diff
From 4db37abe6f0d9c33f0ded9db1103ab10221fb8b4 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Tue, 2 Jul 2013 20:32:53 +1000
|
|
Subject: [PATCH] Entity Mount and Dismount Events
|
|
|
|
|
|
diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
|
|
new file mode 100644
|
|
index 0000000..24d4942
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
|
|
@@ -0,0 +1,39 @@
|
|
+package org.spigotmc.event.entity;
|
|
+
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+/**
|
|
+ * Called when an entity stops riding another entity.
|
|
+ *
|
|
+ */
|
|
+public class EntityDismountEvent extends EntityEvent
|
|
+{
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private final Entity dismounted;
|
|
+
|
|
+ public EntityDismountEvent(Entity what, Entity dismounted)
|
|
+ {
|
|
+ super( what );
|
|
+ this.dismounted = dismounted;
|
|
+ }
|
|
+
|
|
+ public Entity getDismounted()
|
|
+ {
|
|
+ return dismounted;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public HandlerList getHandlers()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
|
|
new file mode 100644
|
|
index 0000000..16aa2a7
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
|
|
@@ -0,0 +1,52 @@
|
|
+package org.spigotmc.event.entity;
|
|
+
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+/**
|
|
+ * Called when an entity attempts to ride another entity.
|
|
+ *
|
|
+ */
|
|
+public class EntityMountEvent extends EntityEvent implements Cancellable
|
|
+{
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private final Entity mount;
|
|
+
|
|
+ public EntityMountEvent(Entity what, Entity mount)
|
|
+ {
|
|
+ super( what );
|
|
+ this.mount = mount;
|
|
+ }
|
|
+
|
|
+ public Entity getMount()
|
|
+ {
|
|
+ return mount;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled()
|
|
+ {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel)
|
|
+ {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public HandlerList getHandlers()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
--
|
|
2.1.0
|
|
|