Skip to content

Commit 96f5b04

Browse files
committed
drop void damage height/damage migration
1 parent bdeba76 commit 96f5b04

18 files changed

Lines changed: 21 additions & 185 deletions

purpur-server/minecraft-patches/features/0008-Configurable-void-damage-height-and-damage.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.

purpur-server/minecraft-patches/features/0009-Implement-elytra-settings.patch renamed to purpur-server/minecraft-patches/features/0008-Implement-elytra-settings.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
55

66

77
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
8-
index df244fa0eb463aa80da39c930eb16c85481e014a..bdae20191d2e5765761442eb06924968e710b189 100644
8+
index a3b83376f1468dbdb4e17fb86d199e66047f686c..5dd1a36b967176f96a18cb0d842ccb73b7b584ef 100644
99
--- a/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/net/minecraft/world/entity/LivingEntity.java
1111
@@ -3643,7 +3643,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -53,7 +53,7 @@ index 18d63d2da49451a2d5e1da7bf0c00e05e2f192bc..1f081e098ce3bec61b7f374e9b737838
5353
itemInHand.shrink(1); // Moved up from below
5454
} else {
5555
diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
56-
index 8c9f64140f016edfadeeb75463655cc2f3fafc0c..84e7f1b119ccfdabf48ccac51278e19743840da7 100644
56+
index 2f0b280d36aefc0cc2a09c395adabdffad43bf17..f1b61e98e07d1d89f9af225f99085d8a3fee878c 100644
5757
--- a/net/minecraft/world/item/ItemStack.java
5858
+++ b/net/minecraft/world/item/ItemStack.java
5959
@@ -725,6 +725,14 @@ public final class ItemStack implements DataComponentHolder {
@@ -72,7 +72,7 @@ index 8c9f64140f016edfadeeb75463655cc2f3fafc0c..84e7f1b119ccfdabf48ccac51278e197
7272
onBreak.accept(item);
7373
}
7474
diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
75-
index 5ed862c4eeb9995b25f6a0ee1b57b2fdafb92551..34bacb05324fd82cbf8b8836998e2619ede3bcb2 100644
75+
index 122e24ed6fb319c951841ac8ef328c5eb70514d4..34d15412b8f68ed1bae45b81ecf759c9c4d7e20c 100644
7676
--- a/net/minecraft/world/item/TridentItem.java
7777
+++ b/net/minecraft/world/item/TridentItem.java
7878
@@ -127,6 +127,18 @@ public class TridentItem extends Item implements ProjectileItem {

purpur-server/minecraft-patches/features/0010-Configurable-jockey-options.patch renamed to purpur-server/minecraft-patches/features/0009-Configurable-jockey-options.patch

File renamed without changes.

purpur-server/minecraft-patches/features/0011-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch renamed to purpur-server/minecraft-patches/features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

File renamed without changes.

purpur-server/minecraft-patches/features/0012-Phantoms-burn-in-light.patch renamed to purpur-server/minecraft-patches/features/0011-Phantoms-burn-in-light.patch

File renamed without changes.

purpur-server/minecraft-patches/features/0013-Make-entity-breeding-times-configurable.patch renamed to purpur-server/minecraft-patches/features/0012-Make-entity-breeding-times-configurable.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ index 2ce0099460c14a6dd8b128f268ee915ea4be5183..1cae770340e969ec4f037b9121142878
4747
animal.resetLove();
4848
level.broadcastEntityEvent(this, (byte)18);
4949
diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
50-
index d07a708f06ba738369882ddaa968c2de9c6c560e..afe7fd92348e6a2a26f8f258373b0c57bb5f4f3f 100644
50+
index 7fbf46efe8007e4b0e2f07c3ada8f0e02484d59d..68acacdf30834fe318862d1900cb18800caa0e13 100644
5151
--- a/net/minecraft/world/entity/animal/Bee.java
5252
+++ b/net/minecraft/world/entity/animal/Bee.java
5353
@@ -480,6 +480,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -222,7 +222,7 @@ index 94031cbd5d40c9a5536b1d1c404bbe2666e8ae0a..d69992a1f729ba99f3992920cd2372a0
222222
@Override
223223
public SpawnGroupData finalizeSpawn(
224224
diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java
225-
index 70d5debdf6a7e9b631e21b47e7e35b15c065410b..142581c85e4ee6be2798fc1d412ce6876f394adb 100644
225+
index bdf0574bf6b70aa7477e1143df24e63d658bc841..f81a448a522fa7551ead16a5ac2b41460235f4b6 100644
226226
--- a/net/minecraft/world/entity/animal/Pig.java
227227
+++ b/net/minecraft/world/entity/animal/Pig.java
228228
@@ -90,6 +90,13 @@ public class Pig extends Animal implements ItemSteerable {
@@ -559,7 +559,7 @@ index fab5a8d0974aab57a1e4a803eb4f3b47a3ee4a07..a21604d3ff3377946cbcbd57ddfa1cbb
559559
protected void defineSynchedData(SynchedEntityData.Builder builder) {
560560
super.defineSynchedData(builder);
561561
diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java
562-
index 601343a604322bae7ef91eecc91da70ee377d8f3..7bbcca12492b114211c71df5cf198da2ac4814f8 100644
562+
index cca4debfabbe60ecea9fc59514a24fc199c79003..99050a33a170b685c2fe3645b80c21b6069ab48a 100644
563563
--- a/net/minecraft/world/entity/animal/wolf/Wolf.java
564564
+++ b/net/minecraft/world/entity/animal/wolf/Wolf.java
565565
@@ -217,6 +217,13 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -577,7 +577,7 @@ index 601343a604322bae7ef91eecc91da70ee377d8f3..7bbcca12492b114211c71df5cf198da2
577577
protected void registerGoals() {
578578
this.goalSelector.addGoal(1, new FloatGoal(this));
579579
diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
580-
index 4ea92637677997ab4c98da437394f5682ba2389a..309cdc88d98eaf61691bc1594275250f55b4f30c 100644
580+
index a68e9f3f96f37b6dd685fd02072f38b9e320fffc..4e300141b0c7fa967e3d0b9ef952097efeb2bef6 100644
581581
--- a/net/minecraft/world/entity/monster/Strider.java
582582
+++ b/net/minecraft/world/entity/monster/Strider.java
583583
@@ -117,6 +117,13 @@ public class Strider extends Animal implements ItemSteerable {

purpur-server/minecraft-patches/features/0014-Apply-display-names-from-item-forms-of-entities-to-e.patch renamed to purpur-server/minecraft-patches/features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
66

77

88
diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
9-
index fb3b4e57e98b45adb3a908ddbc2d4ac066e22034..e0489ff30373c214927f34d78787fb85192318b3 100644
9+
index 4c78de34dc656d3a8c88913c03da4df228b4d134..a3408b9f6306b42a1ce1d8f094695052202c45a7 100644
1010
--- a/net/minecraft/world/entity/decoration/ArmorStand.java
1111
+++ b/net/minecraft/world/entity/decoration/ArmorStand.java
1212
@@ -492,6 +492,7 @@ public class ArmorStand extends LivingEntity {

purpur-server/minecraft-patches/features/0015-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch renamed to purpur-server/minecraft-patches/features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch

File renamed without changes.

purpur-server/minecraft-patches/features/0016-Add-mobGriefing-bypass-to-everything-affected.patch renamed to purpur-server/minecraft-patches/features/0015-Add-mobGriefing-bypass-to-everything-affected.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
55

66

77
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
8-
index bdae20191d2e5765761442eb06924968e710b189..476b570ffe9d2df173bd57b57fe65372cb35fa1d 100644
8+
index 5dd1a36b967176f96a18cb0d842ccb73b7b584ef..13a1b5dd8b1a07a584f71b1f24da28965f5e2a5d 100644
99
--- a/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/net/minecraft/world/entity/LivingEntity.java
1111
@@ -1904,7 +1904,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

purpur-server/minecraft-patches/features/0017-Add-EntityTeleportHinderedEvent.patch renamed to purpur-server/minecraft-patches/features/0016-Add-EntityTeleportHinderedEvent.patch

File renamed without changes.

0 commit comments

Comments
 (0)