mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
8ec7d99ec0
Upstream has released updates that appears to apply and compile correctly Paper Changes: a6ac47e5 Fix numerous item duplication issues and teleport issues b7402f11 Add phantom creative and insomniac controls (#3222) 75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
From 03c1819b749fc733b4a3a502286e33037187f2b8 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 7 Sep 2019 22:47:59 -0500
|
|
Subject: [PATCH] Add option for boats to eject players on land
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityBoat.java | 1 +
|
|
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
|
|
index 563fc8ced..479ed7c7b 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityBoat.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
|
|
@@ -431,6 +431,7 @@ public class EntityBoat extends Entity {
|
|
|
|
if (f > 0.0F) {
|
|
this.aE = f;
|
|
+ if (world.purpurConfig.boatEjectPlayersOnLand) ejectPassengers(); // Purpur
|
|
return EntityBoat.EnumStatus.ON_LAND;
|
|
} else {
|
|
return EntityBoat.EnumStatus.IN_AIR;
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index b8754ba2d..2271d13f1 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -134,6 +134,7 @@ public class PurpurWorldConfig {
|
|
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
|
|
}
|
|
|
|
+ public boolean boatEjectPlayersOnLand = false;
|
|
public boolean controllableMinecarts = false;
|
|
public boolean controllableMinecartsPlaceAnywhere = false;
|
|
public float controllableMinecartsStepHeight = 1.0F;
|
|
@@ -145,6 +146,7 @@ public class PurpurWorldConfig {
|
|
public boolean milkCuresBadOmen = true;
|
|
public boolean useBetterMending = false;
|
|
private void gameplayMechanicsSettings() {
|
|
+ boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
|
|
controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
|
|
controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
|
|
controllableMinecartsStepHeight = (float) getDouble("gameplay-mechanics.controllable-minecarts.step-height", controllableMinecartsStepHeight);
|
|
--
|
|
2.24.0
|
|
|