Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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

6
patches/server/0106-Raid-cooldown-setting.patch
View File

@@ -52,10 +52,10 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
if (!this.raidMap.containsKey(raid.getId())) {
this.raidMap.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ab389b70947d4410148f3e5f243346f63784981b..f0137b639ffa7335943a7dc20d06cb582e2aee9d 100644
index 32973e3b449c6f954f49b9f8f5535ce4a6b7720d..817659cdc0ba25c3418a344661ffeb9394e91ab6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -295,6 +295,7 @@ public class PurpurWorldConfig {
@@ -297,6 +297,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -63,7 +63,7 @@ index ab389b70947d4410148f3e5f243346f63784981b..f0137b639ffa7335943a7dc20d06cb58
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -304,6 +305,7 @@ public class PurpurWorldConfig {
@@ -306,6 +307,7 @@ public class PurpurWorldConfig {
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);