Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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

10
patches/server/0067-Implement-elytra-settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c791d60081a89e00d4bcc95453b9e2c65c47d8f7..4d438cde187f32d4e721c4d3bd46dc0b4fea97af 100644
index 667827901c5b8479ebbbc89c25eec222e4906e7d..0ff49c290f5294e6986d9c2088e441f0ec96ff22 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3416,7 +3416,16 @@ public abstract class LivingEntity extends Entity {
@@ -3419,7 +3419,16 @@ public abstract class LivingEntity extends Entity {
int j = i / 10;
if (j % 2 == 0) {
@@ -54,10 +54,10 @@ index 543a08f920319a2547258640bafebb1e70af65c4..dd211aa7c4ef1e158933a89898b9e5bc
itemStack.shrink(1);
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 455de7226be37b9a0da8824f44bf8fefba2816dd..ac8a90253f45a43486c1677c576231313d2d3e09 100644
index d1183ab1a0d0d6a973bde1640c34cc884f81e167..d57c6a70c0a19b840ae8003d480c480a33a0b02a 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -542,7 +542,7 @@ public final class ItemStack {
@@ -552,7 +552,7 @@ public final class ItemStack {
int j;
if (amount > 0) {
@@ -66,7 +66,7 @@ index 455de7226be37b9a0da8824f44bf8fefba2816dd..ac8a90253f45a43486c1677c57623131
int k = 0;
for (int l = 0; j > 0 && l < amount; ++l) {
@@ -596,6 +596,12 @@ public final class ItemStack {
@@ -606,6 +606,12 @@ public final class ItemStack {
if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent
breakCallback.accept(entity);
Item item = this.getItem();