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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733)
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740)
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
granny
2022-04-16 05:03:34 -07:00
parent daeb232e18
commit d4c11601c7
45 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 043c938baab885ce00e96985159bbd4b233e70fa..3f54c3dcb58cfb3e08149bd09c820f379b9654ba 100644
index 75e1f6b593a23c88f34cc25db580930066bfb7bb..6cb145ce59d26d8c743962166ff7478887dd4eef 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -207,7 +207,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -208,7 +208,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 043c938baab885ce00e96985159bbd4b233e70fa..3f54c3dcb58cfb3e08149bd09c820f37
if (this.player.getAbilities().instabuild || itemstack.is(Items.ENCHANTED_BOOK)) {
flag3 = true;
@@ -219,7 +219,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -220,7 +220,7 @@ public class AnvilMenu extends ItemCombinerMenu {
Enchantment enchantment1 = (Enchantment) iterator1.next();
if (enchantment1 != enchantment && !enchantment.isCompatibleWith(enchantment1)) {
@@ -48,7 +48,7 @@ index 043c938baab885ce00e96985159bbd4b233e70fa..3f54c3dcb58cfb3e08149bd09c820f37
++i;
}
}
@@ -331,7 +331,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -332,7 +332,7 @@ public class AnvilMenu extends ItemCombinerMenu {
sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
this.broadcastChanges();
// Purpur start