Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2025-12-19 15:09:27 +00:00
Code Issues Releases Activity

Allow setting the packet object in the ClientboundPacketPreDispatchEvent

Browse Source
This commit is contained in:
MrPowerGamerBR
2024-06-11 02:06:40 -03:00
parent c7d71fc5a9
commit bf4c9b5b18
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/api/0001-Add-ClientboundPacketPreDispatchEvent.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Add ClientboundPacketPreDispatchEvent
diff --git a/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java b/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java diff --git a/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java b/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..6d36dccdc08e7e523771fde4d8d1bb73e430114c index 0000000000000000000000000000000000000000..91f43f880320508c9f30ae68d603d5342269f177
--- /dev/null --- /dev/null
+++ b/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java +++ b/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java
@@ -0,0 +1,72 @@ @@ -0,0 +1,79 @@
+package net.sparklypower.sparklypaper.event.packet; +package net.sparklypower.sparklypaper.event.packet;
+ +
+import org.bukkit.entity.Player; +import org.bukkit.entity.Player;
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..6d36dccdc08e7e523771fde4d8d1bb73
+ private static final HandlerList handlers = new HandlerList(); + private static final HandlerList handlers = new HandlerList();
+ private boolean isCancelled = false; + private boolean isCancelled = false;
+ private final Player player; + private final Player player;
+ private final Object packet; + private Object packet;
+ +
+ public ClientboundPacketPreDispatchEvent(boolean isAsync, @Nullable Player player, @NotNull Object packet) { + public ClientboundPacketPreDispatchEvent(boolean isAsync, @Nullable Player player, @NotNull Object packet) {
+ super(isAsync); + super(isAsync);
@@ -61,6 +61,13 @@ index 0000000000000000000000000000000000000000..6d36dccdc08e7e523771fde4d8d1bb73
+ return packet; + return packet;
+ } + }
+ +
+ /**
+ * Sets the packet associated with this event.
+ */
+ public void setPacket(Object packet) {
+ this.packet = packet;
+ }
+
+ @NotNull + @NotNull
+ @Override + @Override
+ public HandlerList getHandlers() { + public HandlerList getHandlers() {

5
patches/server/0020-Add-ClientboundPacketPreDispatchEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add ClientboundPacketPreDispatchEvent
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index f40420a6841f03983b0837e177ea2ae7c3a37ca1..18bfe8706209141ce2174588320e84e91f15c94e 100644 index f40420a6841f03983b0837e177ea2ae7c3a37ca1..cd3aaa7ddabbb65250c49c40d4668316284daf74 100644
--- a/src/main/java/net/minecraft/network/Connection.java --- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java
@@ -442,6 +442,17 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> { @@ -442,6 +442,18 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
return; return;
} }
@@ -21,6 +21,7 @@ index f40420a6841f03983b0837e177ea2ae7c3a37ca1..18bfe8706209141ce2174588320e84e9
+ org.bukkit.Bukkit.getPluginManager().callEvent(event); + org.bukkit.Bukkit.getPluginManager().callEvent(event);
+ if (event.isCancelled()) + if (event.isCancelled())
+ return; + return;
+ packet = (Packet<?>) event.getPacket();
+ // SparklyPaper end + // SparklyPaper end
+ +
packet.onPacketDispatch(this.getPlayer()); packet.onPacketDispatch(this.getPlayer());