mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
9147456fc9
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 CraftBukkit Changes: ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic 7dcb59b8e Avoid switch on material in previous commit Spigot Changes: 19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
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 009150ece99c039c7e92ac89c8069a2e378db34a..d87b6ccc57be06739a0105805735feb1800ada69 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -3005,6 +3005,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()
|