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

Add missing option for player cramming

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-03 10:28:04 -05:00
parent c69c0bcadf
commit b1a0ea61ab
110 changed files with 419 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0131-Add-boat-fall-damage-config.patch
View File

@@ -5,7 +5,7 @@ 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
index 1fbb9242f2dcc83befc1c91e55565e73f721af95..790a60e9375e4eea741e0b3769dda3937338746e 100644
index beb3901487525086eb3833ae51587d15c0a06036..c0d2d56fe401f4a5b2ebe67b98bac99e98d0951e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -986,7 +986,16 @@ public class ServerPlayer extends Player {
@@ -27,10 +27,10 @@ index 1fbb9242f2dcc83befc1c91e55565e73f721af95..790a60e9375e4eea741e0b3769dda393
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 50ed815e0d91ffdcdc0a15186a42a32bebe12a9f..9ca45be8960b08368057f2a1adae2fb7dea1346b 100644
index d78b29c42de7bad6a96b02b1f80911d5726abe2e..0b2a8538325204212bfe97c4e3fe5eb1ac88bd8f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -347,6 +347,7 @@ public class PurpurWorldConfig {
@@ -349,6 +349,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index 50ed815e0d91ffdcdc0a15186a42a32bebe12a9f..9ca45be8960b08368057f2a1adae2fb7
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -360,6 +361,7 @@ public class PurpurWorldConfig {
@@ -362,6 +363,7 @@ public class PurpurWorldConfig {
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);