Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.18.2

Browse Source
This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0163-Config-to-allow-for-unsafe-enchants.patch
View File

@@ -27,10 +27,10 @@ index 514cc0e8805045549eacde6c280859aa2dc4a91d..f43fe5becfdbe9973b1cfa43c71bbad2
++i;
} else if (targets.size() == 1) {
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index 437127f223b738efe3532fc6b4c5b724bad99966..35ceeda917c3c49466f97b16a32c7ce9440f46c9 100644
index 043c938baab885ce00e96985159bbd4b233e70fa..3f54c3dcb58cfb3e08149bd09c820f379b9654ba 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -208,7 +208,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -207,7 +207,7 @@ public class AnvilMenu extends ItemCombinerMenu {
int i2 = (Integer) map1.get(enchantment);
i2 = l1 == i2 ? i2 + 1 : Math.max(i2, l1);
@@ -39,7 +39,7 @@ index 437127f223b738efe3532fc6b4c5b724bad99966..35ceeda917c3c49466f97b16a32c7ce9
if (this.player.getAbilities().instabuild || itemstack.is(Items.ENCHANTED_BOOK)) {
flag3 = true;
@@ -220,7 +220,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -219,7 +219,7 @@ public class AnvilMenu extends ItemCombinerMenu {
Enchantment enchantment1 = (Enchantment) iterator1.next();
if (enchantment1 != enchantment && !enchantment.isCompatibleWith(enchantment1)) {
@@ -48,7 +48,7 @@ index 437127f223b738efe3532fc6b4c5b724bad99966..35ceeda917c3c49466f97b16a32c7ce9
++i;
}
}
@@ -332,7 +332,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -331,7 +331,7 @@ public class AnvilMenu extends ItemCombinerMenu {
sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
this.broadcastChanges();
// Purpur start
@@ -58,10 +58,10 @@ index 437127f223b738efe3532fc6b4c5b724bad99966..35ceeda917c3c49466f97b16a32c7ce9
((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
}
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index ac8a90253f45a43486c1677c576231313d2d3e09..a95df369e8cdd7b7b1e31a463fdbae9017ebe2c0 100644
index d57c6a70c0a19b840ae8003d480c480a33a0b02a..84d77fee05eda89cdd37be281e771415dcfabda4 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1148,6 +1148,12 @@ public final class ItemStack {
@@ -1156,6 +1156,12 @@ public final class ItemStack {
return this.tag != null && this.tag.contains("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false;
}
@@ -71,7 +71,7 @@ index ac8a90253f45a43486c1677c576231313d2d3e09..a95df369e8cdd7b7b1e31a463fdbae90
+ }
+ // Purpur end
+
public void addTagElement(String key, net.minecraft.nbt.Tag element) {
public void addTagElement(String key, Tag element) {
this.getOrCreateTag().put(key, element);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java