44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
From f2aa3681729af76cbf7d48b050d2b022dc103701 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 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;
|
||
|
|
|
||
|
|
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 2cc277e4f..553011d88 100644
|
||
|
|
--- 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(),
|
||
|
|
+ packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK,
|
||
|
|
+ packetplayinuseentity.b() == EnumHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND
|
||
|
|
+ ));
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|