41 Zeilen
2.0 KiB
Diff
41 Zeilen
2.0 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/network/protocol/game/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseEntity.java
|
||
|
index 9f3f8568ef9484ba226deaa6429f819c325b7a26..ce63f3e5ac4d1a4311c0ebeb7574d999d45987d9 100644
|
||
|
--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseEntity.java
|
||
|
+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseEntity.java
|
||
|
@@ -11,7 +11,7 @@ import net.minecraft.world.phys.Vec3D;
|
||
|
|
||
|
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/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
index af0a7dc9464e1acf1451f45464bab8546207950e..d3938e1fbab0a01ae5045858b1f421e041b768e2 100644
|
||
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
@@ -2200,6 +2200,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
|
||
|
|
||
|
}
|
||
|
|