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

Update to Minecraft 1.18-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
@Override
public NamespacedKey getKey() {
return CraftNamespacedKey.fromMinecraft(handle.getName());
return CraftNamespacedKey.fromMinecraft(handle.getId());
}
@Override

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

@@ -33,18 +33,18 @@ public class CraftAdvancementProgress implements AdvancementProgress {
@Override
public boolean awardCriteria(String criteria) {
return playerData.grantCriteria(advancement.getHandle(), criteria);
return playerData.award(advancement.getHandle(), criteria);
}
@Override
public boolean revokeCriteria(String criteria) {
return playerData.revokeCritera(advancement.getHandle(), criteria);
return playerData.revoke(advancement.getHandle(), criteria);
}
@Override
public Date getDateAwarded(String criteria) {
CriterionProgress criterion = handle.getCriterionProgress(criteria);
return (criterion == null) ? null : criterion.getDate();
CriterionProgress criterion = handle.getCriterion(criteria);
return (criterion == null) ? null : criterion.getObtained();
}
@Override
@@ -54,6 +54,6 @@ public class CraftAdvancementProgress implements AdvancementProgress {
@Override
public Collection<String> getAwardedCriteria() {
return Collections.unmodifiableCollection(Lists.newArrayList(handle.getAwardedCriteria()));
return Collections.unmodifiableCollection(Lists.newArrayList(handle.getCompletedCriteria()));
}
}