Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
20 Zeilen
1.0 KiB
Diff
20 Zeilen
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Mon, 4 Oct 2021 22:31:51 -0700
|
|
Subject: [PATCH] Fix CraftCriteria defaults map
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
|
|
index a8728102499ec8a0b4946bcc9b59c16193731f8c..d849ef9a51dc901c8045d63218b8ee5fa5c7ee7a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
|
|
@@ -54,7 +54,7 @@ public final class CraftCriteria implements Criteria {
|
|
}
|
|
|
|
static CraftCriteria getFromNMS(Objective objective) {
|
|
- return CraftCriteria.DEFAULTS.get(objective.getCriteria().getName());
|
|
+ return java.util.Objects.requireNonNullElseGet(CraftCriteria.DEFAULTS.get(objective.getCriteria().getName()), () -> new CraftCriteria(objective.getCriteria())); // Paper
|
|
}
|
|
|
|
public static CraftCriteria getFromBukkit(String name) {
|