Make infinite lava setting per-world

This commit is contained in:
William Blake Galbreath
2020-01-02 11:00:19 -06:00
parent 1615576b9a
commit 99b8388073
7 changed files with 99 additions and 51 deletions

View File

@@ -1,4 +1,4 @@
From 4dcf6d4a9e6e6202b8a2275ff8576400f9644869 Mon Sep 17 00:00:00 2001
From 704d8126bd2f4d60fde55740413be8f384583bbf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 22:08:37 -0600
Subject: [PATCH] Add player death exp control options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 3957daf75..15e342454 100644
index 3957daf751..15e342454c 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1858,9 +1858,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -35,10 +35,10 @@ index 3957daf75..15e342454 100644
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a2c81fad3..a0bf56284 100644
index deccd0084a..6351e78902 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -149,6 +149,13 @@ public class PurpurWorldConfig {
@@ -154,6 +154,13 @@ public class PurpurWorldConfig {
hayBlockFallDamage = getBoolean("hay-block-fall-damage", hayBlockFallDamage);
}