Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
bd38e0318a
Updated Upstream (Bukkit/CraftBukkit) 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: f02baa38 PR-988: Add World#getIntersectingChunks(BoundingBox) 9321d665 Move getItemInUse up to LivingEntity 819eef73 PR-959: Add access to current item's remaining ticks c4fdadb0 SPIGOT-7601: Add AbstractArrow#getItem be8261ca Add support for Java 22 26119676 PR-979: Add more translation keys 66753362 PR-985: Correct book maximum pages and characters per page documentation c8be92fa PR-980: Improve getArmorContents() documentation f1120ee2 PR-983: Expose riptide velocity to PlayerRiptideEvent CraftBukkit Changes: dfaa89bbe PR-1369: Add World#getIntersectingChunks(BoundingBox) 51bbab2b9 Move getItemInUse up to LivingEntity 668e09602 PR-1331: Add access to current item's remaining ticks a639406d1 SPIGOT-7601: Add AbstractArrow#getItem 0398930fc SPIGOT-7602: Allow opening in-world horse and related inventories ffd15611c SPIGOT-7608: Allow empty lists to morph to any PDT list 2188dcfa9 Add support for Java 22 45d6a609f SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime" 06d915943 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime ca3bc3707 PR-1361: Add more translation keys 366c3ca80 SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs 06d0f9ba8 SPIGOT-7593: Fix sapling growth physics / client-side updates 45c2608e4 PR-1366: Expose riptide velocity to PlayerRiptideEvent 29b6bb79b SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346
80 Zeilen
3.8 KiB
Diff
80 Zeilen
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 16 Dec 2023 14:46:01 -0800
|
|
Subject: [PATCH] add more scoreboard API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
|
|
index b36e5574c10e6d70a399e2ac0704fd4f43dbb444..2d3abf2a1da487ead74d698cc5ea4eb729c35c8d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
|
|
@@ -185,6 +185,19 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective
|
|
final CraftObjective other = (CraftObjective) obj;
|
|
return !(this.objective != other.objective && (this.objective == null || !this.objective.equals(other.objective)));
|
|
}
|
|
+ // Paper start - add more score API
|
|
+ @Override
|
|
+ public boolean willAutoUpdateDisplay() {
|
|
+ this.checkState();
|
|
+ return this.objective.displayAutoUpdate();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setAutoUpdateDisplay(final boolean autoUpdateDisplay) {
|
|
+ this.checkState();
|
|
+ this.objective.setDisplayAutoUpdate(autoUpdateDisplay);
|
|
+ }
|
|
+ // Paper end - add more score API
|
|
|
|
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
|
|
index ceb1a39c02c3cfa7632a0fdca414c7046888fcb1..74d9c407e971804bed420370f7b684d8658eb5aa 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
|
|
@@ -74,4 +74,44 @@ final class CraftScore implements Score {
|
|
board.resetSinglePlayerScore(entry, this.objective.getHandle());
|
|
}
|
|
// Paper end
|
|
+
|
|
+ // Paper start - add more score API
|
|
+ @Override
|
|
+ public boolean isTriggerable() {
|
|
+ if (this.objective.getTrackedCriteria() != org.bukkit.scoreboard.Criteria.TRIGGER) {
|
|
+ return false;
|
|
+ }
|
|
+ final Scoreboard board = this.objective.checkState().board;
|
|
+ final ReadOnlyScoreInfo scoreInfo = board.getPlayerScoreInfo(this.entry, this.objective.getHandle());
|
|
+ return scoreInfo != null && !scoreInfo.isLocked();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setTriggerable(final boolean triggerable) {
|
|
+ com.google.common.base.Preconditions.checkArgument(this.objective.getTrackedCriteria() == org.bukkit.scoreboard.Criteria.TRIGGER, "the criteria isn't 'trigger'");
|
|
+ final Scoreboard board = this.objective.checkState().board;
|
|
+ if (triggerable) {
|
|
+ board.getOrCreatePlayerScore(this.entry, this.objective.getHandle()).unlock();
|
|
+ } else {
|
|
+ board.getOrCreatePlayerScore(this.entry, this.objective.getHandle()).lock();
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public net.kyori.adventure.text.Component customName() {
|
|
+ final Scoreboard board = this.objective.checkState().board;
|
|
+ final ReadOnlyScoreInfo scoreInfo = board.getPlayerScoreInfo(this.entry, this.objective.getHandle());
|
|
+ if (scoreInfo == null) {
|
|
+ return null; // If score doesn't exist, don't create one
|
|
+ }
|
|
+ final net.minecraft.network.chat.Component display = board.getOrCreatePlayerScore(this.entry, this.objective.getHandle()).display();
|
|
+ return display == null ? null : io.papermc.paper.adventure.PaperAdventure.asAdventure(display);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void customName(final net.kyori.adventure.text.Component customName) {
|
|
+ final Scoreboard board = this.objective.checkState().board;
|
|
+ board.getOrCreatePlayerScore(this.entry, this.objective.getHandle()).display(io.papermc.paper.adventure.PaperAdventure.asVanilla(customName));
|
|
+ }
|
|
+ // Paper end - add more score API
|
|
}
|