Potentially fixed a bug with the execution progress bar?
This commit is contained in:
@@ -116,14 +116,27 @@ public class PlayerExecutionHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void executeKnockedPlayer(ServerPlayer executor, LivingEntity knockedPlayer) {
|
public static void executeKnockedPlayer(ServerPlayer executor, LivingEntity knockedPlayer) {
|
||||||
|
UUID id = knockedPlayer.getUUID();
|
||||||
KnockedManager.removeKnockedState(knockedPlayer);
|
KnockedManager.removeKnockedState(knockedPlayer);
|
||||||
|
cancelExecution(id);
|
||||||
knockedPlayer.kill();
|
knockedPlayer.kill();
|
||||||
|
NetworkHandler.CHANNEL.send(
|
||||||
|
PacketDistributor.PLAYER.with(() -> executor),
|
||||||
|
new ExecutionProgressPacket(0)
|
||||||
|
);
|
||||||
|
if (knockedPlayer instanceof ServerPlayer sp) {
|
||||||
|
NetworkHandler.CHANNEL.send(
|
||||||
|
PacketDistributor.PLAYER.with(() -> sp),
|
||||||
|
new ExecutionProgressPacket(0)
|
||||||
|
);
|
||||||
|
}
|
||||||
executor.sendSystemMessage(Component.literal("You executed " + knockedPlayer.getName().getString() + "!"));
|
executor.sendSystemMessage(Component.literal("You executed " + knockedPlayer.getName().getString() + "!"));
|
||||||
if (knockedPlayer instanceof ServerPlayer serverPlayer) {
|
if (knockedPlayer instanceof ServerPlayer serverPlayer) {
|
||||||
serverPlayer.sendSystemMessage(Component.literal("You were executed by " + executor.getName().getString() + "!"));
|
serverPlayer.sendSystemMessage(Component.literal("You were executed by " + executor.getName().getString() + "!"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onServerTick(TickEvent.ServerTickEvent event) {
|
public static void onServerTick(TickEvent.ServerTickEvent event) {
|
||||||
if (event.phase != TickEvent.Phase.END || !event.side.isServer()) return;
|
if (event.phase != TickEvent.Phase.END || !event.side.isServer()) return;
|
||||||
|
|||||||
Reference in New Issue
Block a user