Skip to content

Commit e74f718

Browse files
grannygranny
committed
the rest of the patches
1 parent 87e5f45 commit e74f718

106 files changed

Lines changed: 958 additions & 1027 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

patches/unapplied/server/0201-Customizeable-Zombie-Villager-curing-times.patch renamed to patches/server/0198-Customizeable-Zombie-Villager-curing-times.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Customizeable Zombie Villager curing times
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
8-
index c3f220a85b91a25662c943b5ee4508cd7a18c75d..40b3498c57c62f8bdaac50546ca47f4927db7bfa 100644
8+
index 5933bff2db353644705f5e1cfec3b0f2dedbad87..ecf41531855e1f60d9739ac6d2d82df7794f072f 100644
99
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
1010
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
11-
@@ -218,7 +218,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
11+
@@ -221,7 +221,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
1212
}
1313

1414
if (!this.level().isClientSide) {
@@ -18,10 +18,10 @@ index c3f220a85b91a25662c943b5ee4508cd7a18c75d..40b3498c57c62f8bdaac50546ca47f49
1818

1919
return InteractionResult.SUCCESS;
2020
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
21-
index d13188a1207352a6ee5ff9c9ed633e7f834a81c9..b3a794d7181aecb8f734b98182f619ee82bb3dbf 100644
21+
index 8cece9543a87ac86a8320fef4a23b39dbc76ab5c..b2f365ab51b56a83ed7ea67c921c163c3511b834 100644
2222
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2323
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
24-
@@ -2774,6 +2774,8 @@ public class PurpurWorldConfig {
24+
@@ -2770,6 +2770,8 @@ public class PurpurWorldConfig {
2525
public double zombieVillagerJockeyChance = 0.05D;
2626
public boolean zombieVillagerJockeyTryExistingChickens = true;
2727
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index d13188a1207352a6ee5ff9c9ed633e7f834a81c9..b3a794d7181aecb8f734b98182f619ee
3030
private void zombieVillagerSettings() {
3131
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
3232
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
33-
@@ -2789,6 +2791,8 @@ public class PurpurWorldConfig {
33+
@@ -2785,6 +2787,8 @@ public class PurpurWorldConfig {
3434
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
3535
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
3636
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);

patches/unapplied/server/0202-Option-for-sponges-to-work-on-lava-and-mud.patch renamed to patches/server/0199-Option-for-sponges-to-work-on-lava-and-mud.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Option for sponges to work on lava and mud
66
Co-authored by: granny <granny@purpurmc.org>
77

88
diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
9-
index 709dd0af07f2439d7c7e8b5cd0677580dc3f6278..2276fed1feb4fea59b5bd49b5e4586d49478b3cc 100644
9+
index e7b19fa84d9dce28dd88a3b4adcb83576dcb98a8..cc1ac862526377b2ac7b66bc20f428dc1aed6e78 100644
1010
--- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
1111
+++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
12-
@@ -67,7 +67,7 @@ public class SpongeBlock extends Block {
12+
@@ -70,7 +70,7 @@ public class SpongeBlock extends Block {
1313
FluidState fluid = blockList.getFluidState(blockposition1);
1414
// CraftBukkit end
1515

@@ -18,7 +18,7 @@ index 709dd0af07f2439d7c7e8b5cd0677580dc3f6278..2276fed1feb4fea59b5bd49b5e4586d4
1818
return false;
1919
} else {
2020
Block block = iblockdata.getBlock();
21-
@@ -82,6 +82,10 @@ public class SpongeBlock extends Block {
21+
@@ -85,6 +85,10 @@ public class SpongeBlock extends Block {
2222

2323
if (iblockdata.getBlock() instanceof LiquidBlock) {
2424
blockList.setBlock(blockposition1, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit
@@ -30,10 +30,10 @@ index 709dd0af07f2439d7c7e8b5cd0677580dc3f6278..2276fed1feb4fea59b5bd49b5e4586d4
3030
if (!iblockdata.is(Blocks.KELP) && !iblockdata.is(Blocks.KELP_PLANT) && !iblockdata.is(Blocks.SEAGRASS) && !iblockdata.is(Blocks.TALL_SEAGRASS)) {
3131
return false;
3232
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
33-
index b3a794d7181aecb8f734b98182f619ee82bb3dbf..309f2360d3faa4e7f6932329623b9b9647cd5f98 100644
33+
index b2f365ab51b56a83ed7ea67c921c163c3511b834..13aa8ae8f33834793adf18c12541c2ecd2d0699f 100644
3434
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
3535
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
36-
@@ -953,9 +953,13 @@ public class PurpurWorldConfig {
36+
@@ -949,9 +949,13 @@ public class PurpurWorldConfig {
3737

3838
public int spongeAbsorptionArea = 65;
3939
public int spongeAbsorptionRadius = 6;

patches/unapplied/server/0203-Toggle-for-Wither-s-spawn-sound.patch renamed to patches/server/0200-Toggle-for-Wither-s-spawn-sound.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for Wither's spawn sound
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
8-
index ff5d08f0cf323606ca2eb8bef3f487c7a86029e2..5bf7a6ecd58612c8502ed747263b6c0edd445294 100644
8+
index 86b06182616fe07f1a5ef2b1799c434884cba149..9abc47eb3d0c1a0ee0868ec223431f4de4925c77 100644
99
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
1010
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
11-
@@ -425,7 +425,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
11+
@@ -418,7 +418,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
1212
}
1313
// CraftBukkit end
1414

@@ -18,18 +18,18 @@ index ff5d08f0cf323606ca2eb8bef3f487c7a86029e2..5bf7a6ecd58612c8502ed747263b6c0e
1818
// this.level().globalLevelEvent(1023, new BlockPosition(this), 0);
1919
int viewDistance = ((ServerLevel) this.level()).getCraftServer().getViewDistance() * 16;
2020
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
21-
index 309f2360d3faa4e7f6932329623b9b9647cd5f98..21c597f6f010bca75115354b8cf5d567d8d0f474 100644
21+
index 13aa8ae8f33834793adf18c12541c2ecd2d0699f..7670e4e1291e8c48b960ee44977d4850b470a81e 100644
2222
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2323
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
24-
@@ -2621,6 +2621,7 @@ public class PurpurWorldConfig {
24+
@@ -2617,6 +2617,7 @@ public class PurpurWorldConfig {
2525
public boolean witherTakeDamageFromWater = false;
2626
public boolean witherCanRideVehicles = false;
2727
public float witherExplosionRadius = 1.0F;
2828
+ public boolean witherPlaySpawnSound = true;
2929
private void witherSettings() {
3030
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
3131
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
32-
@@ -2642,6 +2643,7 @@ public class PurpurWorldConfig {
32+
@@ -2638,6 +2639,7 @@ public class PurpurWorldConfig {
3333
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
3434
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
3535
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);

patches/unapplied/server/0204-Cactus-breaks-from-solid-neighbors-config.patch renamed to patches/server/0201-Cactus-breaks-from-solid-neighbors-config.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index 0003fb51ae3a6575575e10b4c86719f3061e2577..c2ca3432a47124d02e1aaf8ffb621f9a
1818
return false;
1919
}
2020
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
21-
index 21c597f6f010bca75115354b8cf5d567d8d0f474..45d77adb73d0df1e856088d3df6cffb6a4623cd7 100644
21+
index 7670e4e1291e8c48b960ee44977d4850b470a81e..2951c05d64f7c1667343dd781800816b7fae5cb9 100644
2222
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2323
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
24-
@@ -779,6 +779,11 @@ public class PurpurWorldConfig {
24+
@@ -775,6 +775,11 @@ public class PurpurWorldConfig {
2525
});
2626
}
2727

patches/unapplied/server/0205-Config-to-remove-curse-of-binding-with-weakness.patch renamed to patches/server/0202-Config-to-remove-curse-of-binding-with-weakness.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Config to remove curse of binding with weakness
55

66

77
diff --git a/src/main/java/net/minecraft/world/inventory/InventoryMenu.java b/src/main/java/net/minecraft/world/inventory/InventoryMenu.java
8-
index c549618421c5d077c3d977d8d2064eca2acc438a..5972fa434847d24fa98b7895fd8386d20a636885 100644
8+
index b399903e8f11ec6c12fe7e724b7d9c8292acd573..a4afa946cd47238eb0fed297a27b24013d5ba77c 100644
99
--- a/src/main/java/net/minecraft/world/inventory/InventoryMenu.java
1010
+++ b/src/main/java/net/minecraft/world/inventory/InventoryMenu.java
1111
@@ -4,6 +4,7 @@ import com.mojang.datafixers.util.Pair;
@@ -26,18 +26,18 @@ index c549618421c5d077c3d977d8d2064eca2acc438a..5972fa434847d24fa98b7895fd8386d2
2626

2727
@Override
2828
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
29-
index 45d77adb73d0df1e856088d3df6cffb6a4623cd7..8e5912f9a1e3d4b97306bf31833afc435cd026e8 100644
29+
index 2951c05d64f7c1667343dd781800816b7fae5cb9..f64c758f51134e8102ca4092bc313eefd346d211 100644
3030
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
3131
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
32-
@@ -408,6 +408,7 @@ public class PurpurWorldConfig {
32+
@@ -406,6 +406,7 @@ public class PurpurWorldConfig {
3333
public int playerPortalWaitTime = 80;
3434
public int playerCreativePortalWaitTime = 1;
3535
public boolean playerRidableInWater = false;
3636
+ public boolean playerRemoveBindingWithWeakness = false;
3737
private void playerSettings() {
3838
if (PurpurConfig.version < 19) {
3939
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
40-
@@ -435,6 +436,7 @@ public class PurpurWorldConfig {
40+
@@ -431,6 +432,7 @@ public class PurpurWorldConfig {
4141
playerPortalWaitTime = getInt("gameplay-mechanics.player.portal-wait-time", playerPortalWaitTime);
4242
playerCreativePortalWaitTime = getInt("gameplay-mechanics.player.creative-portal-wait-time", playerCreativePortalWaitTime);
4343
playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);

patches/unapplied/server/0206-Conduit-behavior-configuration.patch renamed to patches/server/0203-Conduit-behavior-configuration.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
7777
});
7878

7979
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
80-
index 8e5912f9a1e3d4b97306bf31833afc435cd026e8..97afdc6199fd2b3c2033c8b3a27d2e5059f780cb 100644
80+
index f64c758f51134e8102ca4092bc313eefd346d211..5fd3e6bab03a2adcb776720b242c902b1330779e 100644
8181
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
8282
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
83-
@@ -2840,4 +2840,27 @@ public class PurpurWorldConfig {
83+
@@ -2836,4 +2836,27 @@ public class PurpurWorldConfig {
8484
private void hungerSettings() {
8585
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
8686
}

patches/unapplied/server/0207-Cauldron-fill-chances.patch renamed to patches/server/0204-Cauldron-fill-chances.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ index cd943997f11f5ea5c600fdc6db96043fb0fa713c..4adeda49a2e422e11f885bffb311653d
4747

4848
if (dripChance < f1) {
4949
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
50-
index 97afdc6199fd2b3c2033c8b3a27d2e5059f780cb..389ed035a2fb98675f6779628a620ad0680823f8 100644
50+
index 5fd3e6bab03a2adcb776720b242c902b1330779e..909e6bb2781637e5f4c2525371de2ad0b5524afe 100644
5151
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5252
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
53-
@@ -2863,4 +2863,15 @@ public class PurpurWorldConfig {
53+
@@ -2859,4 +2859,15 @@ public class PurpurWorldConfig {
5454
});
5555
conduitBlocks = conduitBlockList.toArray(Block[]::new);
5656
}

patches/unapplied/server/0208-Config-to-allow-mobs-to-pathfind-over-rails.patch renamed to patches/server/0205-Config-to-allow-mobs-to-pathfind-over-rails.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ index 3583fcf5284bc5883308876dbd9886664b391e28..d976a6df54c1e817def2d588692abe25
1818
if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) {
1919
double g = (double)(x - direction.getStepX()) + 0.5D;
2020
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
21-
index 389ed035a2fb98675f6779628a620ad0680823f8..14a9bbb6bda6ba245a84cfe7ed80dd591ae41dd7 100644
21+
index 909e6bb2781637e5f4c2525371de2ad0b5524afe..8ae2e7f81d1d6a09d9b733ae27ad6c99a58aeb2e 100644
2222
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2323
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
2424
@@ -138,6 +138,7 @@ public class PurpurWorldConfig {

patches/unapplied/server/0209-Shulker-change-color-with-dye.patch renamed to patches/server/0206-Shulker-change-color-with-dye.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Shulker change color with dye
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
8-
index a0b19ffbdb64c40d8b92ed82104dde323b466190..714adaf017813eb64bb3a9a60b5ff45737e4d95d 100644
8+
index 786fe41cc743817f2ed613969c7eeec9fc001b4b..40f4a53cf244549e9cf392f4286bdec1a6852574 100644
99
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
1010
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
1111
@@ -22,6 +22,8 @@ import net.minecraft.tags.DamageTypeTags;
@@ -17,16 +17,16 @@ index a0b19ffbdb64c40d8b92ed82104dde323b466190..714adaf017813eb64bb3a9a60b5ff457
1717
import net.minecraft.world.damagesource.DamageSource;
1818
import net.minecraft.world.entity.Entity;
1919
import net.minecraft.world.entity.EntityDimensions;
20-
@@ -50,6 +52,8 @@ import net.minecraft.world.entity.projectile.AbstractArrow;
20+
@@ -49,6 +51,8 @@ import net.minecraft.world.entity.player.Player;
21+
import net.minecraft.world.entity.projectile.AbstractArrow;
2122
import net.minecraft.world.entity.projectile.ShulkerBullet;
22-
import net.minecraft.world.entity.vehicle.Boat;
2323
import net.minecraft.world.item.DyeColor;
2424
+import net.minecraft.world.item.DyeItem;
2525
+import net.minecraft.world.item.ItemStack;
2626
import net.minecraft.world.level.Level;
2727
import net.minecraft.world.level.ServerLevelAccessor;
2828
import net.minecraft.world.level.block.Blocks;
29-
@@ -125,6 +129,19 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
29+
@@ -124,6 +128,19 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
3030
return this.level().purpurConfig.shulkerTakeDamageFromWater;
3131
}
3232

@@ -47,18 +47,18 @@ index a0b19ffbdb64c40d8b92ed82104dde323b466190..714adaf017813eb64bb3a9a60b5ff457
4747
protected void registerGoals() {
4848
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
4949
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
50-
index 14a9bbb6bda6ba245a84cfe7ed80dd591ae41dd7..36bf7feb12b83f97612fa221a48fcffb61f9de88 100644
50+
index 8ae2e7f81d1d6a09d9b733ae27ad6c99a58aeb2e..a8cddd10832e6be2704569b6c1fb995bd9caf0b9 100644
5151
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
5252
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
53-
@@ -2183,6 +2183,7 @@ public class PurpurWorldConfig {
53+
@@ -2179,6 +2179,7 @@ public class PurpurWorldConfig {
5454
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
5555
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
5656
public boolean shulkerSpawnFromBulletRandomColor = false;
5757
+ public boolean shulkerChangeColorWithDye = false;
5858
private void shulkerSettings() {
5959
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
6060
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
61-
@@ -2199,6 +2200,7 @@ public class PurpurWorldConfig {
61+
@@ -2195,6 +2196,7 @@ public class PurpurWorldConfig {
6262
shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
6363
shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
6464
shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);

patches/unapplied/server/0210-Extended-OfflinePlayer-API.patch renamed to patches/server/0207-Extended-OfflinePlayer-API.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Extended OfflinePlayer API
55

66

77
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
8-
index c1b874cd6e0498fce3cd53fdbaca30d290e004d7..23087d511b609693f0bb06cbaac8b6cf8d0defe2 100644
8+
index 03fc90a470c0f63d44161843cac88bea09166858..88640ac32d70ced6e8b1984663e1c492dd673cb5 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
1111
@@ -567,4 +567,213 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -223,10 +223,10 @@ index c1b874cd6e0498fce3cd53fdbaca30d290e004d7..23087d511b609693f0bb06cbaac8b6cf
223223
+ // Purpur end - OfflinePlayer API
224224
}
225225
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
226-
index 5965b4e91e63a3d3b64e5193399ae3b6d774120b..5baf36d8d65574f3e57de0937a949cff03435d30 100644
226+
index a0523c36af5a2e33f8f46663794a8df68409f80f..19f6bad1b81c5a5c249631b43e1f6c159dc994e0 100644
227227
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
228228
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
229-
@@ -2505,6 +2505,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
229+
@@ -2521,6 +2521,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
230230
return this.getHandle().getAbilities().walkingSpeed * 2f;
231231
}
232232

0 commit comments

Comments
 (0)