mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 877f9dfcb737f543b84fb49c12f7ddcb390d6f08 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 | 5 +++++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
|
|
index 03624bbd6a..36969eeb2b 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityBoat.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
|
|
@@ -427,6 +427,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 38d85c6389..b2c62de053 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -70,6 +70,11 @@ public class PurpurWorldConfig {
|
|
bambooSmallHeight = getInt("bamboo.small-height", bambooSmallHeight);
|
|
}
|
|
|
|
+ public boolean boatEjectPlayersOnLand = false;
|
|
+ private void boatEjectPlayersOnLand() {
|
|
+ boatEjectPlayersOnLand = getBoolean("boat-eject-players-on-land", boatEjectPlayersOnLand);
|
|
+ }
|
|
+
|
|
public boolean campfireObeysGravity = true;
|
|
private void campfireObeysGravity() {
|
|
campfireObeysGravity = getBoolean("campfire-obeys-gravity", campfireObeysGravity);
|
|
--
|
|
2.24.0
|
|
|