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

Move all config stuff to config patch

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-25 20:08:05 -05:00
parent 44e4acda63
commit 4a2d580185
146 changed files with 506 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0160-One-Punch-Man.patch
View File

@@ -30,10 +30,10 @@ index 5c82dd279fc3a5847e2e0ed6c9cf9e70acfb3bff..c123e723d4fc3202eb7a4c74a356ffcd
if (human) {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4c3ffb3bc74ee37113549fa7d984360f098dc1a0..0c52a00a00e8ff92450174b9301f805a77a36b39 100644
index 026c4e5ddedcf732e1ef0c66736193a627d6eb25..c3e20c28044eb0fe5e39c68ce635b692ec9f141b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -288,6 +288,7 @@ public class PurpurWorldConfig {
@@ -290,6 +290,7 @@ public class PurpurWorldConfig {
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
@@ -41,7 +41,7 @@ index 4c3ffb3bc74ee37113549fa7d984360f098dc1a0..0c52a00a00e8ff92450174b9301f805a
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -300,6 +301,7 @@ public class PurpurWorldConfig {
@@ -302,6 +303,7 @@ public class PurpurWorldConfig {
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);