mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-27 23:19:36 +02:00
058d7c1aa3
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 13eb4146 SPIGOT-5217, SPIGOT-6183: Add RespawnReason to PlayerRespawnEvent CraftBukkit Changes: 5ee3419b7 SPIGOT-5217, SPIGOT-6183: Add RespawnReason to PlayerRespawnEvent Spigot Changes: 514cf03a Rebuild patches and add RespawnReason.PLUGIN to Player#respawn
58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: dawon <dawon@dawon.eu>
|
|
Date: Sat, 15 Oct 2022 00:46:57 +0200
|
|
Subject: [PATCH] Add Player Warden Warning API
|
|
|
|
== AT ==
|
|
public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
|
|
public net.minecraft.world.entity.monster.warden.WardenSpawnTracker ticksSinceLastWarning
|
|
public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTicks
|
|
public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 5cab74f4ae272cf730392cb143d45df737e641f2..59a7c5eb74b9ca7108d6fa9a1335e4a9816f6cf3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -3159,6 +3159,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
public void showElderGuardian(boolean silent) {
|
|
if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public int getWardenWarningCooldown() {
|
|
+ return this.getHandle().wardenSpawnTracker.cooldownTicks;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setWardenWarningCooldown(int cooldown) {
|
|
+ this.getHandle().wardenSpawnTracker.cooldownTicks = Math.max(cooldown, 0);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getWardenTimeSinceLastWarning() {
|
|
+ return this.getHandle().wardenSpawnTracker.ticksSinceLastWarning;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setWardenTimeSinceLastWarning(int time) {
|
|
+ this.getHandle().wardenSpawnTracker.ticksSinceLastWarning = time;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getWardenWarningLevel() {
|
|
+ return this.getHandle().wardenSpawnTracker.getWarningLevel();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setWardenWarningLevel(int warningLevel) {
|
|
+ this.getHandle().wardenSpawnTracker.setWarningLevel(warningLevel);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void increaseWardenWarningLevel() {
|
|
+ this.getHandle().wardenSpawnTracker.increaseWarningLevel();
|
|
+ }
|
|
// Paper end
|
|
|
|
public Player.Spigot spigot()
|