twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-18 22:03:51 -07:00
Code Issues 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

10
paper-server/nms-patches/net/minecraft/advancements/Advancement.patch
View File

@@ -1,10 +0,0 @@
--- a/net/minecraft/advancements/Advancement.java
+++ b/net/minecraft/advancements/Advancement.java
@@ -41,6 +41,7 @@
private final Set<Advancement> children = Sets.newLinkedHashSet();
private final IChatBaseComponent chatComponent;
private final boolean sendsTelemetryEvent;
+ public final org.bukkit.advancement.Advancement bukkit = new org.bukkit.craftbukkit.advancement.CraftAdvancement(this); // CraftBukkit
public Advancement(MinecraftKey minecraftkey, @Nullable Advancement advancement, @Nullable AdvancementDisplay advancementdisplay, AdvancementRewards advancementrewards, Map<String, Criterion> map, String[][] astring, boolean flag) {
this.id = minecraftkey;

25
paper-server/nms-patches/net/minecraft/advancements/AdvancementHolder.patch Normal file
View File

@@ -0,0 +1,25 @@
--- a/net/minecraft/advancements/AdvancementHolder.java
+++ b/net/minecraft/advancements/AdvancementHolder.java
@@ -3,6 +3,11 @@
import net.minecraft.network.PacketDataSerializer;
import net.minecraft.resources.MinecraftKey;
+// CraftBukkit start
+import org.bukkit.craftbukkit.advancement.CraftAdvancement;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+// CraftBukkit end
+
public record AdvancementHolder(MinecraftKey id, Advancement value) {
public void write(PacketDataSerializer packetdataserializer) {
@@ -41,4 +46,10 @@
public String toString() {
return this.id.toString();
}
+
+ // CraftBukkit start
+ public final org.bukkit.advancement.Advancement toBukkit() {
+ return new CraftAdvancement(this);
+ }
+ // CraftBukkit end
}

20
paper-server/nms-patches/net/minecraft/advancements/AdvancementTree.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/net/minecraft/advancements/AdvancementTree.java
+++ b/net/minecraft/advancements/AdvancementTree.java
@@ -68,7 +68,7 @@
}
public void addAll(Collection<AdvancementHolder> collection) {
- ArrayList arraylist = new ArrayList(collection);
+ ArrayList<AdvancementHolder> arraylist = new ArrayList(collection); // CraftBukkit - decompile error
while (!arraylist.isEmpty()) {
if (!arraylist.removeIf(this::tryInsert)) {
@@ -77,7 +77,7 @@
}
}
- AdvancementTree.LOGGER.info("Loaded {} advancements", this.nodes.size());
+ // AdvancementTree.LOGGER.info("Loaded {} advancements", this.nodes.size()); // CraftBukkit - moved to AdvancementDataWorld#reload
}
private boolean tryInsert(AdvancementHolder advancementholder) {

20
paper-server/nms-patches/net/minecraft/advancements/Advancements.patch
View File

@@ -1,20 +0,0 @@
--- a/net/minecraft/advancements/Advancements.java
+++ b/net/minecraft/advancements/Advancements.java
@@ -80,7 +80,7 @@
entry = (Entry) iterator.next();
MinecraftKey minecraftkey = (MinecraftKey) entry.getKey();
Advancement.SerializedAdvancement advancement_serializedadvancement = (Advancement.SerializedAdvancement) entry.getValue();
- Map map1 = this.advancements;
+ Map<MinecraftKey, Advancement> map1 = this.advancements; // CraftBukkit - decompile error
Objects.requireNonNull(this.advancements);
if (advancement_serializedadvancement.canBuild(map1::get)) {
@@ -117,7 +117,7 @@
}
}
- Advancements.LOGGER.info("Loaded {} advancements", this.advancements.size());
+ // Advancements.LOGGER.info("Loaded {} advancements", this.advancements.size()); // CraftBukkit - moved to AdvancementDataWorld#reload
}
public void clear() {