Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +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@ff251e4 Use reference hash set in reference Holder (#11363)
PaperMC/Paper@691d452 Fix bundled spark permission check (#11355)
PaperMC/Paper@012c527 Update Velocity natives (#11347)
PaperMC/Paper@953e6e9 Fire BlockExpEvent on grindstone use (#11346)
PaperMC/Paper@10f5879 Change condition check order of entity tracking Y (#11348)
PaperMC/Paper@805a974 Improve console completion with brig suggestions (#9251)
PaperMC/Paper@e0021b1 Fix allowSpiderWorldBorderClimbing world config (#11321)
PaperMC/Paper@3db4758 Check dead flag in isAlive() (#11330)
This commit is contained in:
granny
2024-09-06 20:31:46 -07:00
parent a43711d9b0
commit 0a9941ee39
6 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0211-Config-for-grindstones.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config for grindstones
diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
index 1678f6c8b2c7db761783e53043169bf12bc2cb29..5d47ffc3fd31930c7dd2f23bc0e6b7da513d1595 100644
index 138f77d13dda574def523d74fa55bc71b5bfa01b..57c9e636a10e5845f197cae39d4f885a1817d1f7 100644
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
@@ -131,7 +131,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -135,7 +135,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
Holder<Enchantment> holder = (Holder) entry.getKey();
int k = entry.getIntValue();
@@ -17,7 +17,7 @@ index 1678f6c8b2c7db761783e53043169bf12bc2cb29..5d47ffc3fd31930c7dd2f23bc0e6b7da
j += ((Enchantment) holder.value()).getMinCost(k);
}
}
@@ -230,7 +230,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -234,7 +234,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
Entry<Holder<Enchantment>> entry = (Entry) iterator.next();
Holder<Enchantment> holder = (Holder) entry.getKey();
@@ -26,7 +26,7 @@ index 1678f6c8b2c7db761783e53043169bf12bc2cb29..5d47ffc3fd31930c7dd2f23bc0e6b7da
itemenchantments_a.upgrade(holder, entry.getIntValue());
}
}
@@ -238,10 +238,70 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -242,10 +242,70 @@ public class GrindstoneMenu extends AbstractContainerMenu {
});
}
@@ -98,7 +98,7 @@ index 1678f6c8b2c7db761783e53043169bf12bc2cb29..5d47ffc3fd31930c7dd2f23bc0e6b7da
});
});
@@ -256,6 +316,23 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -260,6 +320,23 @@ public class GrindstoneMenu extends AbstractContainerMenu {
}
item.set(DataComponents.REPAIR_COST, i);