41 Zeilen
1.9 KiB
Diff
41 Zeilen
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 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 49c911e54eb3b20d820f3e1895c057eead6d312b..09c757a3bb1d9a49343cf58e18f736e1fa9e10c7 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 c1d0aa8248af19124b1c94313602cd4dadcc95df..3aa6cae8b7f27264ee5f910d13df876b568968e4 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -2057,6 +2057,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
}
|
|
}
|
|
}
|
|
+ // Paper start - fire event
|
|
+ else {
|
|
+ this.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerUseUnknownEntityEvent(
|
|
+ this.getPlayer(),
|
|
+ packetplayinuseentity.getEntityId(),
|
|
+ packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK,
|
|
+ packetplayinuseentity.c() == EnumHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND
|
|
+ ));
|
|
+ }
|
|
+ // Paper end
|
|
|
|
}
|
|
|