Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use proper input values for controllable minecarts, closes #1624

Browse Source
This commit is contained in:
granny
2024-12-14 22:53:37 -08:00
parent 4a204f1bd7
commit 73dae7f683
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
patches/server/0041-Minecart-settings-and-WASD-controls.patch
View File

@@ -5,29 +5,29 @@ Subject: [PATCH] Minecart settings and WASD controls
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index ae4733c402662630a3892aecd01646d2e7613eed..d8a5d37e3b796392d6b0548371d4f0801d4d9bec 100644 index 0f979af9131678991860765163fcc4b0453ef52a..664b43e4442d3c07995840d756ced8c3c96d3f7d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1439,6 +1439,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -1439,6 +1439,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
if (this.isInvulnerableTo(world, source)) { if (this.isInvulnerableTo(world, source)) {
return false; return false;
} else { } else {
+ if (source.is(net.minecraft.tags.DamageTypeTags.IS_FALL) && getRootVehicle() instanceof net.minecraft.world.entity.vehicle.AbstractMinecart && level().purpurConfig.minecartControllable && !level().purpurConfig.minecartControllableFallDamage) return false; // Purpur + if (source.is(net.minecraft.tags.DamageTypeTags.IS_FALL) && getRootVehicle() instanceof net.minecraft.world.entity.vehicle.AbstractMinecart && level().purpurConfig.minecartControllable && !level().purpurConfig.minecartControllableFallDamage) return false; // Purpur - Minecart settings and WASD controls
Entity entity = source.getEntity(); Entity entity = source.getEntity();
if (entity instanceof net.minecraft.world.entity.player.Player) { if (entity instanceof net.minecraft.world.entity.player.Player) {
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..b31940441596079aae1cd2a38b9d22be18358448 100644 index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..d0c93f87795d7162bbfb3fdadadb6ae1c5fdaeeb 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -92,6 +92,10 @@ public abstract class AbstractMinecart extends VehicleEntity { @@ -92,6 +92,10 @@ public abstract class AbstractMinecart extends VehicleEntity {
private double flyingY = 0.95; private double flyingY = 0.95;
private double flyingZ = 0.95; private double flyingZ = 0.95;
public Double maxSpeed; public Double maxSpeed;
+ // Purpur start + // Purpur start - Minecart settings and WASD controls
+ public double storedMaxSpeed; + public double storedMaxSpeed;
+ public boolean isNewBehavior; + public boolean isNewBehavior;
+ // Purpur end + // Purpur end - Minecart settings and WASD controls
// CraftBukkit end // CraftBukkit end
public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
@@ -35,13 +35,13 @@ index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..b31940441596079aae1cd2a38b9d22be
this.blocksBuilding = true; this.blocksBuilding = true;
if (AbstractMinecart.useExperimentalMovement(world)) { if (AbstractMinecart.useExperimentalMovement(world)) {
this.behavior = new NewMinecartBehavior(this); this.behavior = new NewMinecartBehavior(this);
+ this.isNewBehavior = true; // Purpur + this.isNewBehavior = true; // Purpur - Minecart settings and WASD controls
} else { } else {
this.behavior = new OldMinecartBehavior(this); this.behavior = new OldMinecartBehavior(this);
+ // Purpur start + // Purpur start - Minecart settings and WASD controls
+ this.isNewBehavior = false; + this.isNewBehavior = false;
+ maxSpeed = storedMaxSpeed = world.purpurConfig.minecartMaxSpeed; + maxSpeed = storedMaxSpeed = world.purpurConfig.minecartMaxSpeed;
+ // Purpur end + // Purpur end - Minecart settings and WASD controls
} }
} }
@@ -49,22 +49,22 @@ index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..b31940441596079aae1cd2a38b9d22be
@Override @Override
public void tick() { public void tick() {
+ // Purpur start + // Purpur start - Minecart settings and WASD controls
+ if (!this.isNewBehavior) { + if (!this.isNewBehavior) {
+ if (storedMaxSpeed != level().purpurConfig.minecartMaxSpeed) { + if (storedMaxSpeed != level().purpurConfig.minecartMaxSpeed) {
+ maxSpeed = storedMaxSpeed = level().purpurConfig.minecartMaxSpeed; + maxSpeed = storedMaxSpeed = level().purpurConfig.minecartMaxSpeed;
+ } + }
+ } + }
+ // Purpur end + // Purpur end - Minecart settings and WASD controls
+ +
// CraftBukkit start // CraftBukkit start
double prevX = this.getX(); double prevX = this.getX();
double prevY = this.getY(); double prevY = this.getY();
@@ -426,16 +443,62 @@ public abstract class AbstractMinecart extends VehicleEntity { @@ -426,16 +443,63 @@ public abstract class AbstractMinecart extends VehicleEntity {
this.behavior.moveAlongTrack(world); this.behavior.moveAlongTrack(world);
} }
+ // Purpur start + // Purpur start - Minecart settings and WASD controls
+ private Double lastSpeed; + private Double lastSpeed;
+ +
+ public double getControllableSpeed() { + public double getControllableSpeed() {
@@ -81,7 +81,7 @@ index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..b31940441596079aae1cd2a38b9d22be
+ } + }
+ return lastSpeed = speed; + return lastSpeed = speed;
+ } + }
+ // Purpur end + // Purpur end - Minecart settings and WASD controls
+ +
protected void comeOffTrack(ServerLevel world) { protected void comeOffTrack(ServerLevel world) {
double d0 = this.getMaxSpeed(world); double d0 = this.getMaxSpeed(world);
@@ -89,17 +89,18 @@ index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..b31940441596079aae1cd2a38b9d22be
this.setDeltaMovement(Mth.clamp(vec3d.x, -d0, d0), vec3d.y, Mth.clamp(vec3d.z, -d0, d0)); this.setDeltaMovement(Mth.clamp(vec3d.x, -d0, d0), vec3d.y, Mth.clamp(vec3d.z, -d0, d0));
+ +
+ // Purpur start + // Purpur start - Minecart settings and WASD controls
+ if (level().purpurConfig.minecartControllable && !isInWater() && !isInLava() && !passengers.isEmpty()) { + if (level().purpurConfig.minecartControllable && !isInWater() && !isInLava() && !passengers.isEmpty()) {
+ Entity passenger = passengers.get(0); + Entity passenger = passengers.get(0);
+ if (passenger instanceof Player) { + if (passenger instanceof net.minecraft.server.level.ServerPlayer player) {
+ Player player = (Player) passenger; + net.minecraft.world.entity.player.Input lastClientInput = player.getLastClientInput();
+ if (player.jumping && this.onGround) { + float forward = (lastClientInput.forward() == lastClientInput.backward() ? 0.0F : lastClientInput.forward() ? 1.0F : -1.0F);
+ if (lastClientInput.jump() && this.onGround) {
+ setDeltaMovement(new Vec3(getDeltaMovement().x, level().purpurConfig.minecartControllableHopBoost, getDeltaMovement().z)); + setDeltaMovement(new Vec3(getDeltaMovement().x, level().purpurConfig.minecartControllableHopBoost, getDeltaMovement().z));
+ } + }
+ if (player.zza != 0.0F) { + if (forward != 0.0F) {
+ Vector velocity = player.getBukkitEntity().getEyeLocation().getDirection().normalize().multiply(getControllableSpeed()); + Vector velocity = player.getBukkitEntity().getEyeLocation().getDirection().normalize().multiply(getControllableSpeed());
+ if (player.zza < 0.0) { + if (forward < 0.0) {
+ velocity.multiply(-0.5); + velocity.multiply(-0.5);
+ } + }
+ setDeltaMovement(new Vec3(velocity.getX(), getDeltaMovement().y, velocity.getZ())); + setDeltaMovement(new Vec3(velocity.getX(), getDeltaMovement().y, velocity.getZ()));
@@ -112,19 +113,19 @@ index cdc8606ffe5c75ee19d92e9f86f26b2a502d765e..b31940441596079aae1cd2a38b9d22be
+ } else { + } else {
+ maxUpStep = 0.0F; + maxUpStep = 0.0F;
+ } + }
+ // Purpur end + // Purpur end - Minecart settings and WASD controls
+ +
if (this.onGround()) { if (this.onGround()) {
// CraftBukkit start - replace magic numbers with our variables // CraftBukkit start - replace magic numbers with our variables
this.setDeltaMovement(new Vec3(this.getDeltaMovement().x * this.derailedX, this.getDeltaMovement().y * this.derailedY, this.getDeltaMovement().z * this.derailedZ)); this.setDeltaMovement(new Vec3(this.getDeltaMovement().x * this.derailedX, this.getDeltaMovement().y * this.derailedY, this.getDeltaMovement().z * this.derailedZ));
// CraftBukkit end // CraftBukkit end
} }
+ else if (level().purpurConfig.minecartControllable) setDeltaMovement(new Vec3(getDeltaMovement().x * derailedX, getDeltaMovement().y, getDeltaMovement().z * derailedZ)); // Purpur + else if (level().purpurConfig.minecartControllable) setDeltaMovement(new Vec3(getDeltaMovement().x * derailedX, getDeltaMovement().y, getDeltaMovement().z * derailedZ)); // Purpur - Minecart settings and WASD controls
this.move(MoverType.SELF, this.getDeltaMovement()); this.move(MoverType.SELF, this.getDeltaMovement());
if (!this.onGround()) { if (!this.onGround()) {
diff --git a/src/main/java/net/minecraft/world/item/MinecartItem.java b/src/main/java/net/minecraft/world/item/MinecartItem.java diff --git a/src/main/java/net/minecraft/world/item/MinecartItem.java b/src/main/java/net/minecraft/world/item/MinecartItem.java
index 7153d9ed12276a0f2d8b8a17c79734aa25ed1fa5..dc49ea6454e04ae8ec68af12c4bf2ff022540671 100644 index 7153d9ed12276a0f2d8b8a17c79734aa25ed1fa5..a82faf7f07cd71c8748979a726b1e7857d88e195 100644
--- a/src/main/java/net/minecraft/world/item/MinecartItem.java --- a/src/main/java/net/minecraft/world/item/MinecartItem.java
+++ b/src/main/java/net/minecraft/world/item/MinecartItem.java +++ b/src/main/java/net/minecraft/world/item/MinecartItem.java
@@ -35,8 +35,9 @@ public class MinecartItem extends Item { @@ -35,8 +35,9 @@ public class MinecartItem extends Item {
@@ -133,9 +134,9 @@ index 7153d9ed12276a0f2d8b8a17c79734aa25ed1fa5..dc49ea6454e04ae8ec68af12c4bf2ff0
if (!iblockdata.is(BlockTags.RAILS)) { if (!iblockdata.is(BlockTags.RAILS)) {
- return InteractionResult.FAIL; - return InteractionResult.FAIL;
- } else { - } else {
+ if (!world.purpurConfig.minecartPlaceAnywhere) return InteractionResult.FAIL; // Purpur + if (!world.purpurConfig.minecartPlaceAnywhere) return InteractionResult.FAIL; // Purpur - Minecart settings and WASD controls
+ if (iblockdata.isSolid()) blockposition = blockposition.relative(context.getClickedFace()); + if (iblockdata.isSolid()) blockposition = blockposition.relative(context.getClickedFace());
+ } // else { // Purpur - place minecarts anywhere + } // else { // Purpur - Minecart settings and WASD controls
ItemStack itemstack = context.getItemInHand(); ItemStack itemstack = context.getItemInHand();
RailShape blockpropertytrackposition = iblockdata.getBlock() instanceof BaseRailBlock ? (RailShape) iblockdata.getValue(((BaseRailBlock) iblockdata.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH; RailShape blockpropertytrackposition = iblockdata.getBlock() instanceof BaseRailBlock ? (RailShape) iblockdata.getValue(((BaseRailBlock) iblockdata.getBlock()).getShapeProperty()) : RailShape.NORTH_SOUTH;
double d0 = 0.0D; double d0 = 0.0D;
@@ -144,7 +145,7 @@ index 7153d9ed12276a0f2d8b8a17c79734aa25ed1fa5..dc49ea6454e04ae8ec68af12c4bf2ff0
return InteractionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
- } - }
+ // } // Purpur - place minecarts anywhere + // } // Purpur - Minecart settings and WASD controls
} }
} }
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java

10
patches/server/0105-Add-boat-fall-damage-config.patch
View File

@@ -5,16 +5,16 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6f769f90038042ac11cdd59f36d7f3fd85cfd490..f63c1eca0c7ecaec70aaae56c479aaae42df3008 100644 index 0719be3a59219cf381a716da32331c4cd3f3f3a2..93ccb6f984ae6194eeecefb4d1511dbb7e7fc7ae 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1439,7 +1439,16 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -1439,7 +1439,16 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
if (this.isInvulnerableTo(world, source)) { if (this.isInvulnerableTo(world, source)) {
return false; return false;
} else { } else {
- if (source.is(net.minecraft.tags.DamageTypeTags.IS_FALL) && getRootVehicle() instanceof net.minecraft.world.entity.vehicle.AbstractMinecart && level().purpurConfig.minecartControllable && !level().purpurConfig.minecartControllableFallDamage) return false; // Purpur - if (source.is(net.minecraft.tags.DamageTypeTags.IS_FALL) && getRootVehicle() instanceof net.minecraft.world.entity.vehicle.AbstractMinecart && level().purpurConfig.minecartControllable && !level().purpurConfig.minecartControllableFallDamage) return false; // Purpur - Minecart settings and WASD controls
+ // Purpur start + // Purpur start - Add boat fall damage config
+ if (source.is(net.minecraft.tags.DamageTypeTags.IS_FALL)) { // Purpur + if (source.is(net.minecraft.tags.DamageTypeTags.IS_FALL)) {
+ if (getRootVehicle() instanceof net.minecraft.world.entity.vehicle.AbstractMinecart && level().purpurConfig.minecartControllable && !level().purpurConfig.minecartControllableFallDamage) { + if (getRootVehicle() instanceof net.minecraft.world.entity.vehicle.AbstractMinecart && level().purpurConfig.minecartControllable && !level().purpurConfig.minecartControllableFallDamage) {
+ return false; + return false;
+ } + }
@@ -22,7 +22,7 @@ index 6f769f90038042ac11cdd59f36d7f3fd85cfd490..f63c1eca0c7ecaec70aaae56c479aaae
+ return false; + return false;
+ } + }
+ } + }
+ // Purpur end + // Purpur end - Add boat fall damage config
Entity entity = source.getEntity(); Entity entity = source.getEntity();
if (entity instanceof net.minecraft.world.entity.player.Player) { if (entity instanceof net.minecraft.world.entity.player.Player) {