mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
fe53b0e76f
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: 1d522878 PR-966: Introduce getRespawnLocation as a replacement for getBedSpawnLocation cc01b745 PR-965: Add DragonBattle#setPreviouslyKilled 28e3702f SPIGOT-6921, PR-957: Add methods to remove all enchantments on an ItemStack 8872404e PR-961: Add BlockData#copyTo 4054cc7b PR-956: Add method to get an offline player's location CraftBukkit Changes: 292ec79e0 SPIGOT-7568: Call EntityChangeBlockEvent for DecoratedPot b44bf5aa8 SPIGOT-7575: SuspiciousStewMeta creates invalid PotionEffect data 161784713 PR-1340: Centralize the conversion from and to Minecraft / Bukkit registry items even more and add a test case for them b93c5a30d PR-1338: Introduce getRespawnLocation as a replacement for getBedSpawnLocation fb973486c SPIGOT-7570: PrepareItemCraftEvent#isRepair() always returns false c9c24535e PR-1337: Add DragonBattle#setPreviouslyKilled c8b4da803 SPIGOT-6921, PR-1330: Add methods to remove all enchantments on an ItemStack 95bc1c4f5 PR-1333: Add BlockData#copyTo 36e2f9ce1 PR-1329: Add method to get an offline player's location Spigot Changes: c198da22 SPIGOT-7563: Update to latest release of bungeecord-chat
57 lines
2.3 KiB
Diff
57 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 432790b46ad5edcf504a3aab603597585c82913c..be5b8e12a7a15b97a34ddd9f50b8780a74faffbf 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -3169,6 +3169,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()
|