mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
41e6f20420
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: fdff0cd4 PR-869: Add Enderman#teleport and Enderman#teleportTowards dfd86ee7 Improve sendSignChange and related documentation beced2b2 PR-867: Add Player#sendBlockUpdate to send tile entity updates CraftBukkit Changes: ad6d0cffb SPIGOT-7394: Fix another issue with sendSignChange 66c5ce4c7 SPIGOT-7391: Preserve vanilla sign json where not modified by event ae3824f94 PR-1204: Add Enderman#teleport and Enderman#teleportTowards 5863a2eae Fix sendSignChange not working 4a7eadc97 PR-1201: Add Player#sendBlockUpdate to send tile entity updates 789324e30 Work around issue placing decorated pots
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 3975546e58ae69d5d9f662a446d0d68a731f45dc..627872976ae4c01f3e87b210ed745622e72c8552 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -3088,6 +3088,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()
|