Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
79 Zeilen
4.1 KiB
Diff
79 Zeilen
4.1 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
|
|
|
|
Adds the PlayerUseUnknownEntityEvent to be used by plugins dealing with
|
|
virtual entities/entities that are not actually known to the server.
|
|
|
|
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
|
|
index b1bc671490329379e0a61466c13ca88c49259721..3a377e887989f591c671fec31208255252b58a78 100644
|
|
--- a/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
|
|
+++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
|
|
@@ -167,4 +167,14 @@ public class ServerboundInteractPacket implements Packet<ServerGamePacketListene
|
|
buf.writeEnum(this.hand);
|
|
}
|
|
}
|
|
+
|
|
+ // Paper start - PlayerUseUnknownEntityEvent
|
|
+ public int getEntityId() {
|
|
+ return this.entityId;
|
|
+ }
|
|
+
|
|
+ public boolean isAttack() {
|
|
+ return this.action.getType() == ActionType.ATTACK;
|
|
+ }
|
|
+ // Paper end - PlayerUseUnknownEntityEvent
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index f7babb4883a45244dd07eab1e87cf5fd4df83d91..19ff229f90d07447947afa8b4794b683feceb574 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2404,7 +2404,26 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
});
|
|
}
|
|
}
|
|
+ // Paper start - PlayerUseUnknownEntityEvent
|
|
+ else {
|
|
+ packet.dispatch(new net.minecraft.network.protocol.game.ServerboundInteractPacket.Handler() {
|
|
+ @Override
|
|
+ public void onInteraction(net.minecraft.world.InteractionHand hand) {
|
|
+ CraftEventFactory.callPlayerUseUnknownEntityEvent(ServerGamePacketListenerImpl.this.player, packet, hand, null);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void onInteraction(net.minecraft.world.InteractionHand hand, net.minecraft.world.phys.Vec3 pos) {
|
|
+ CraftEventFactory.callPlayerUseUnknownEntityEvent(ServerGamePacketListenerImpl.this.player, packet, hand, pos);
|
|
+ }
|
|
|
|
+ @Override
|
|
+ public void onAttack() {
|
|
+ CraftEventFactory.callPlayerUseUnknownEntityEvent(ServerGamePacketListenerImpl.this.player, packet, net.minecraft.world.InteractionHand.MAIN_HAND, null);
|
|
+ }
|
|
+ });
|
|
+ }
|
|
+ // Paper end - PlayerUseUnknownEntityEvent
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 5ee9726324591055bb5d00cf9646203fbe7cc833..8de2f4ca83017d37c63d33c6283078a71143f077 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -1856,4 +1856,13 @@ public class CraftEventFactory {
|
|
|
|
Bukkit.getPluginManager().callEvent(new EntityRemoveEvent(entity.getBukkitEntity(), cause));
|
|
}
|
|
+ // Paper start - PlayerUseUnknownEntityEvent
|
|
+ public static void callPlayerUseUnknownEntityEvent(net.minecraft.world.entity.player.Player player, net.minecraft.network.protocol.game.ServerboundInteractPacket packet, InteractionHand hand, @Nullable net.minecraft.world.phys.Vec3 vector) {
|
|
+ new com.destroystokyo.paper.event.player.PlayerUseUnknownEntityEvent(
|
|
+ (Player) player.getBukkitEntity(), packet.getEntityId(), packet.isAttack(),
|
|
+ CraftEquipmentSlot.getHand(hand),
|
|
+ vector != null ? CraftVector.toBukkit(vector) : null
|
|
+ ).callEvent();
|
|
+ }
|
|
+ // Paper end - PlayerUseUnknownEntityEvent
|
|
}
|