SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
View File

@@ -2,39 +2,39 @@ package org.bukkit.craftbukkit.advancement;
import java.util.Collection;
import java.util.Collections;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementHolder;
import org.bukkit.NamespacedKey;
import org.bukkit.advancement.AdvancementDisplay;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
public class CraftAdvancement implements org.bukkit.advancement.Advancement {
private final Advancement handle;
private final AdvancementHolder handle;
public CraftAdvancement(Advancement handle) {
public CraftAdvancement(AdvancementHolder handle) {
this.handle = handle;
}
public Advancement getHandle() {
public AdvancementHolder getHandle() {
return handle;
}
@Override
public NamespacedKey getKey() {
return CraftNamespacedKey.fromMinecraft(handle.getId());
return CraftNamespacedKey.fromMinecraft(handle.id());
}
@Override
public Collection<String> getCriteria() {
return Collections.unmodifiableCollection(handle.getCriteria().keySet());
return Collections.unmodifiableCollection(handle.value().criteria().keySet());
}
@Override
public AdvancementDisplay getDisplay() {
if (handle.getDisplay() == null) {
if (handle.value().display().isEmpty()) {
return null;
}
return new CraftAdvancementDisplay(handle.getDisplay());
return new CraftAdvancementDisplay(handle.value().display().get());
}
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java
View File

@@ -44,7 +44,7 @@ public class CraftAdvancementProgress implements AdvancementProgress {
@Override
public Date getDateAwarded(String criteria) {
CriterionProgress criterion = handle.getCriterion(criteria);
return (criterion == null) ? null : criterion.getObtained();
return (criterion == null) ? null : Date.from(criterion.getObtained());
}
@Override