44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
From 702c81ef81451505a29dc4e69823911c21a965b9 Mon Sep 17 00:00:00 2001
|
||
|
|
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 2b23a5d..6464a84 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
|
||
|
|
@@ -4,7 +4,7 @@ import java.io.IOException;
|
||
|
|
|
||
|
|
public class PacketPlayInUseEntity implements Packet<PacketListenerPlayIn> {
|
||
|
|
|
||
|
|
- 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
|
||
|
|
index ff64891..b60b134 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
|
|
@@ -1615,6 +1615,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(),
|
||
|
|
+ packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK,
|
||
|
|
+ packetplayinuseentity.b() == EnumHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND
|
||
|
|
+ ));
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|