Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

we compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2023-06-09 09:57:52 -04:00
parent 589c34e018
commit 71c445017d
22 changed files with 110 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0280-Add-death-screen-API.patch
View File

@@ -4,51 +4,19 @@ Date: Fri, 23 Sep 2022 18:41:05 -0700
Subject: [PATCH] Add death screen API
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerCombatKillPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerCombatKillPacket.java
index 76a62d872bc2ad12efd9522d8dd445b8d2342525..075a891413d072998e6d468e76d839e1a3bf7da9 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerCombatKillPacket.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerCombatKillPacket.java
@@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet;
public class ClientboundPlayerCombatKillPacket implements Packet<ClientGamePacketListener> {
private final int playerId;
private final Component message;
+ public net.kyori.adventure.text.Component adventure$message; // Purpur
public ClientboundPlayerCombatKillPacket(int entityId, Component message) {
this.playerId = entityId;
@@ -21,6 +22,12 @@ public class ClientboundPlayerCombatKillPacket implements Packet<ClientGamePacke
@Override
public void write(FriendlyByteBuf buf) {
buf.writeVarInt(this.playerId);
+ // Purpur start
+ if (this.adventure$message != null) {
+ buf.writeComponent(this.adventure$message);
+ return;
+ }
+ // Purpur end
buf.writeComponent(this.message);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index bfab934938bc0650fd6cbf0b551edecbbaf37404..bcd26a48a9fe3443eed943a3b131c1d5eb3da345 100644
index bfab934938bc0650fd6cbf0b551edecbbaf37404..f6d102cacbe50f6cc5f947de341ec0475d02472a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3254,5 +3254,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3254,5 +3254,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (this.getHandle().connection == null) return;
this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR, new FriendlyByteBuf(io.netty.buffer.Unpooled.buffer())));
}
+
+ @Override
+ public void sendDeathScreen(net.kyori.adventure.text.Component message) {
+ sendDeathScreen(message, null);
+ }
+
+ @Override
+ public void sendDeathScreen(net.kyori.adventure.text.Component message, org.bukkit.entity.Entity killer) {
+ if (this.getHandle().connection == null) return;
+ net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket packet = new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), killer == null ? -1 : killer.getEntityId(), null);
+ packet.adventure$message = message;
+ this.getHandle().connection.send(packet);
+ this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
+ }
// Purpur end
}