mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
1718f61bf8
Doesn't compile yet. CraftBukkit Changes: 90d6905b Repackage NMS 69cf961d Repackage patches Spigot Changes: 79d53c28 Repackage NMS
40 lines
2 KiB
Diff
40 lines
2 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 98189c2f4c973427563c48a231bf8e6c21e0391d..7aec9a349ea941153863d95eb8df4f8c884b5617 100644
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
|
@@ -2197,6 +2197,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
|
|
|
|
}
|
|
|