From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Sun, 13 Dec 2020 20:40:57 -0500 Subject: [PATCH] Striders give saddle back diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java index a0bb64bea373c678c519e3fae8f808fd36e1ee4f..11911b10ddc6e2a681f2eda313a6e7c68674a1ac 100644 --- a/src/main/java/net/minecraft/server/EntityStrider.java +++ b/src/main/java/net/minecraft/server/EntityStrider.java @@ -376,6 +376,18 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab if (!flag && this.hasSaddle() && !this.isVehicle() && !entityhuman.eq()) { if (!this.world.isClientSide) { + // Purpur start + if (world.purpurConfig.striderGiveSaddleBack && entityhuman.isSneaking()) { + this.saddleStorage.setSaddle(false); + if (!entityhuman.abilities.canInstantlyBuild) { + ItemStack saddle = new ItemStack(Items.SADDLE); + if (!entityhuman.inventory.pickup(saddle)) { + entityhuman.drop(saddle, false); + } + } + return EnumInteractionResult.SUCCESS; + } + // Purpur end entityhuman.startRiding(this); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index 9ccf82239a3c5ee319ef64e9e5519c563e8dbcbd..8aa4a08f4b8af273ea2f3e32066faec597e36015 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1500,11 +1500,13 @@ public class PurpurWorldConfig { public boolean striderRidable = false; public boolean striderRidableInWater = false; public int striderBreedingTicks = 6000; + public boolean striderGiveSaddleBack = false; public double striderMaxHealth = 20.0D; private void striderSettings() { striderRidable = getBoolean("mobs.strider.ridable", striderRidable); striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater); striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks); + striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack); if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.strider.attributes.max-health", striderMaxHealth); set("mobs.strider.attributes.max-health", null);