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

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0072-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 b4640aa8fe8a37a6f27a626862b68b630bd370cd..7192cc7e5a78af2a611bfd853972ac92a5490f23 100644
index ddc469e3c431c417820461ea9cb6e9c8bbad17cd..cb1ed54aa49a93fff15a0d72d459fd7adc037f6c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3278,7 +3278,16 @@ public abstract class LivingEntity extends Entity {
@@ -3281,7 +3281,16 @@ public abstract class LivingEntity extends Entity {
int j = i / 10;
if (j % 2 == 0) {
@@ -54,7 +54,7 @@ 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 7c1852c7e32fe1945fde0ec3f3b9b96dfa0c1043..5bd25f8b8a554b965665b3f5686c14189b51f28e 100644
index e2cc529405d80f4e8f22117da98ee6474351c218..18da9a82fb2ca4b9b8d80e37df29c76c8214c37f 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -540,7 +540,7 @@ public final class ItemStack {
@@ -99,10 +99,10 @@ index 510ed67a7de2b503ab8b01db57ed09ee33b0d825..3f53dc8f250ad3f7616ce7ef0a2353ca
entityhuman.startAutoSpinAttack(20);
if (entityhuman.isOnGround()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 437997c9e221e2fa8cdda52ad0028a87e41ed081..93348fe8e75088755a53d4bc5e347bc5642b0635 100644
index 580871c876a4b115968856c9d99b0442778f8063..6b5f7f895a9e53582bd2dee373b8b2eb1899e2da 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,6 +98,19 @@ public class PurpurWorldConfig {
@@ -97,6 +97,19 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}