2018-07-18 05:08:17 +00:00
|
|
|
From 6d4327193f6dc1773ded2f0ecdb48e141f864542 Mon Sep 17 00:00:00 2001
|
2018-07-15 01:53:17 +00:00
|
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
|
|
Date: Sat, 2 Apr 2016 05:09:16 -0400
|
|
|
|
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
|
|
|
|
index 77440ac81..8711462e1 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
|
|
|
|
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
|
2018-07-18 05:08:17 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
public class PacketPlayInUseEntity implements Packet<PacketListenerPlayIn> {
|
2018-07-18 05:08:17 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
- private int a;
|
|
|
|
+ private int a; public int getEntityId() { return this.a; } // Paper - add accessor
|
|
|
|
private PacketPlayInUseEntity.EnumEntityUseAction action;
|
|
|
|
private Vec3D c;
|
|
|
|
private EnumHand d;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2018-07-18 05:08:17 +00:00
|
|
|
index 2cc277e4f..b1f483990 100644
|
2018-07-15 01:53:17 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
@@ -1888,6 +1888,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ // Paper start - fire event
|
|
|
|
+ else {
|
|
|
|
+ this.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerUseUnknownEntityEvent(
|
|
|
|
+ this.getPlayer(),
|
|
|
|
+ packetplayinuseentity.getEntityId(),
|
2018-07-18 05:08:17 +00:00
|
|
|
+ packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK,
|
|
|
|
+ packetplayinuseentity.c() == EnumHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND
|
2018-07-15 01:53:17 +00:00
|
|
|
+ ));
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2018-07-18 05:08:17 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
}
|
|
|
|
|
2018-07-18 05:08:17 +00:00
|
|
|
--
|
|
|
|
2.18.0
|