Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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/Paperr@b164899 Update tiny-remapper
PaperMC/Paperr@f7dbd06 [ci skip] Update parameter mappings
PaperMC/Paperr@ca523ab [ci skip] Fix param mismatch from last commit
PaperMC/Paperr@2e99e5e Updated Upstream (Bukkit/CraftBukkit) (#7411)
This commit is contained in:
BillyGalbreath
2022-01-27 10:26:18 -06:00
parent 414cf7d035
commit 102d0e2a46
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
mcVersion = 1.18.1
packageVersion = 1_18_R1
paperCommit = 9490475b02446b0839846c86fb52e4e27e0ab3a2
paperCommit = 2e99e5e6771f032bc14eb607ce0186ca4ae050d9
org.gradle.caching = true
org.gradle.parallel = true

4
patches/api/0018-Anvil-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Anvil API
diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
index b95e563b5454306a9188ae3295309ee86a756477..435026e533ea9edb8c1800d35c63543ca023a904 100644
index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c1f2081be 100644
--- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
+++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
@@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {
@@ -123,4 +123,14 @@ public interface AnvilInventory extends Inventory {
setItem(2, result);
}
// Paper end

6
patches/server/0019-Anvil-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Anvil API
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index 073cec4838b88bf4e7444321a74ab73fff732486..3314cb81d4d5ce9c1d5472e1213b6bcc1c688b9c 100644
index a8d1ffd70c539cac42df9f086e4e336990e5a383..415c0cd772f0bca5dcfa606b2dd3b034424ff911 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -2,7 +2,11 @@ package net.minecraft.world.inventory;
@@ -104,7 +104,7 @@ index 073cec4838b88bf4e7444321a74ab73fff732486..3314cb81d4d5ce9c1d5472e1213b6bcc
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
index 3ff03e3e8c723d0f2a7c115d4dba01f1b3c2c46e..4dc71c761371400fb92e6943ba44bf40968dae97 100644
index 88d3ca586ff6905f18a8ab9f0e229f440ed44088..27dd4eb4781a3c75772860c11db886e1038cecd2 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
@@ -9,7 +9,7 @@ import org.bukkit.inventory.AnvilInventory;
@@ -116,7 +116,7 @@ index 3ff03e3e8c723d0f2a7c115d4dba01f1b3c2c46e..4dc71c761371400fb92e6943ba44bf40
public CraftInventoryAnvil(Location location, Container inventory, Container resultInventory, AnvilMenu container) {
super(inventory, resultInventory);
@@ -47,4 +47,26 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
@@ -57,4 +57,26 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
Preconditions.checkArgument(levels >= 0, "Maximum repair cost must be positive (or 0)");
container.maximumRepairCost = levels;
}