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

Add option to campfires for regen potion requirement

Browse Source
This commit is contained in:
William Blake Galbreath
2019-08-01 12:28:25 -05:00
parent 45c96b8532
commit 6064bbc422
9 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0014-Add-regen-effect-to-campfires.patch
View File

@@ -1,4 +1,4 @@
From c53688c4c3bf7053639574370a40ea890001923a Mon Sep 17 00:00:00 2001
From b26a3bb41ca58ca161ed36cefe2773bce4e5ac1b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Add regen effect to campfires
@@ -7,11 +7,11 @@ Subject: [PATCH] Add regen effect to campfires
.../net/minecraft/server/EntityLiving.java | 15 ++++++++--
.../net/minecraft/server/EntityPotion.java | 26 ++++++++++++++++
.../minecraft/server/TileEntityCampfire.java | 30 +++++++++++++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 21 +++++++++++++
4 files changed, 89 insertions(+), 3 deletions(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 23 ++++++++++++++
4 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2b7925b5d..8b6dd4527 100644
index 2b7925b5..8b6dd452 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2715,10 +2715,19 @@ public abstract class EntityLiving extends Entity {
@@ -38,7 +38,7 @@ index 2b7925b5d..8b6dd4527 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 998336557..2642e86f7 100644
index 99833655..2642e86f 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
@@ -82,7 +82,7 @@ index 998336557..2642e86f7 100644
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
index 2317adde4..7360e462d 100644
index 2317adde..f112a848 100644
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
@@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -98,7 +98,7 @@ index 2317adde4..7360e462d 100644
} else {
if (flag) {
+ // Purpur start
+ if (splashed && world.purpurConfig.campfireRegenInterval > 0 && world.getTime() % world.purpurConfig.campfireRegenInterval == 0L) {
+ if ((splashed || !world.purpurConfig.campfireRequireRegenPotion) && world.purpurConfig.campfireRegenInterval > 0 && world.getTime() % world.purpurConfig.campfireRegenInterval == 0L) {
+ boolean signalBoost = getBlock().get(BlockCampfire.c);
+ int duration = signalBoost ? world.purpurConfig.campfireRegenBoostDuration : world.purpurConfig.campfireRegenDuration;
+ byte amp = (byte) (signalBoost ? world.purpurConfig.campfireRegenBoostAmp : world.purpurConfig.campfireRegenAmp);
@@ -151,10 +151,10 @@ index 2317adde4..7360e462d 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 30f11fe26..cea2bcad5 100644
index 30f11fe2..22b6a0fd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -60,4 +60,25 @@ public class PurpurWorldConfig {
@@ -60,4 +60,27 @@ public class PurpurWorldConfig {
config.addDefault("world-settings.default." + path, def);
return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
}
@@ -168,6 +168,7 @@ index 30f11fe26..cea2bcad5 100644
+ public int campfireRegenBoostRange = 10;
+ public int campfireRegenBoostAmp = 1;
+ public boolean campfireRegenBoostRequireLineOfSight = false;
+ public boolean campfireRequireRegenPotion = true;
+ private void campfireRegenSettings() {
+ campfireRegenInterval = getInt("campfire-regen.interval", campfireRegenInterval);
+ campfireRegenDuration = getInt("campfire-regen.duration", campfireRegenDuration);
@@ -178,6 +179,7 @@ index 30f11fe26..cea2bcad5 100644
+ campfireRegenBoostRange = getInt("campfire-regen.boost-range", campfireRegenBoostRange);
+ campfireRegenBoostAmp = getInt("campfire-regen.boost-amplifier", campfireRegenBoostAmp);
+ campfireRegenBoostRequireLineOfSight = getBoolean("campfire-regen.boost-require-line-of-sight", campfireRegenBoostRequireLineOfSight);
+ campfireRequireRegenPotion = getBoolean("campfire-regn.requires-regen-potion-to-activate", campfireRequireRegenPotion);
+ }
}
--

10
patches/server/0016-Campfires-burn-out-in-rain.patch
View File

@@ -1,4 +1,4 @@
From 772093c1b3329d32f97ba272c2e9d2c454a89635 Mon Sep 17 00:00:00 2001
From da3b9e3e06081d66b950b038a91819ef7e41e9b4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 21:30:49 -0500
Subject: [PATCH] Campfires burn out in rain
@@ -9,7 +9,7 @@ Subject: [PATCH] Campfires burn out in rain
2 files changed, 8 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index d2363d1d2..563f16a3f 100644
index d2363d1d..563f16a3 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -86,6 +86,9 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -23,12 +23,12 @@ index d2363d1d2..563f16a3f 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dc2da586e..c3a9133fa 100644
index 09971838..4e8f0b03 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -86,4 +86,9 @@ public class PurpurWorldConfig {
campfireRegenBoostAmp = getInt("campfire-regen.boost-amplifier", campfireRegenBoostAmp);
@@ -88,4 +88,9 @@ public class PurpurWorldConfig {
campfireRegenBoostRequireLineOfSight = getBoolean("campfire-regen.boost-require-line-of-sight", campfireRegenBoostRequireLineOfSight);
campfireRequireRegenPotion = getBoolean("campfire-regn.requires-regen-potion-to-activate", campfireRequireRegenPotion);
}
+
+ public boolean campfiresGoOutInRain = true;

12
patches/server/0020-Allow-color-codes-on-signs.patch
View File

@@ -1,4 +1,4 @@
From 436e103add5da635f034f9f8ac7ab3259874fce0 Mon Sep 17 00:00:00 2001
From ff15aa3bed02c1d829c032ee6aa11b6b9f601d22 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Allow color codes on signs
@@ -11,7 +11,7 @@ Subject: [PATCH] Allow color codes on signs
4 files changed, 21 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 18695d9b5..8c59692b2 100644
index 18695d9b..8c59692b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1114,6 +1114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,7 +23,7 @@ index 18695d9b5..8c59692b2 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e7b8b2e99..520490d59 100644
index e7b8b2e9..520490d5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2561,6 +2561,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -35,7 +35,7 @@ index e7b8b2e99..520490d59 100644
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 0a8d9b52d..65771ed9e 100644
index 0a8d9b52..65771ed9 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -122,6 +122,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -60,10 +60,10 @@ index 0a8d9b52d..65771ed9e 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 673fff5ce..f090f76a1 100644
index b1d89450..82643156 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -96,4 +96,9 @@ public class PurpurWorldConfig {
@@ -98,4 +98,9 @@ public class PurpurWorldConfig {
private void campfiresGoOutInRain() {
campfiresGoOutInRain = getBoolean("campfires-go-out-in-rain", campfiresGoOutInRain);
}

8
patches/server/0025-Add-config-for-items-breaking-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From 22f8029702025d6bd1ded97cefadcea661af8fc6 Mon Sep 17 00:00:00 2001
From 77f10a01dd4804673ad11a080ba31150b1b0dfb3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] Add config for items breaking turtle eggs
@@ -9,7 +9,7 @@ Subject: [PATCH] Add config for items breaking turtle eggs
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
index 0118a8451..83e69425b 100644
index 0118a845..83e69425 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -163,6 +163,17 @@ public class BlockTurtleEgg extends Block {
@@ -32,10 +32,10 @@ index 0118a8451..83e69425b 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f090f76a1..9dfba251e 100644
index 82643156..bc782e2f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,4 +101,9 @@ public class PurpurWorldConfig {
@@ -103,4 +103,9 @@ public class PurpurWorldConfig {
private void allowSignColors() {
allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
}

8
patches/server/0027-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -1,4 +1,4 @@
From 664c3eafdb18c420fa8db53e1be66ecdc004d90d Mon Sep 17 00:00:00 2001
From 681f21db603f6b0553f3bd9dedbbfb8a76a5a044 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 21 Jun 2019 14:37:10 -0500
Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
index 2fc6e210d..54f913901 100644
index 2fc6e210..54f91390 100644
--- a/src/main/java/net/minecraft/server/BlockSoil.java
+++ b/src/main/java/net/minecraft/server/BlockSoil.java
@@ -112,19 +112,14 @@ public class BlockSoil extends Block {
@@ -40,10 +40,10 @@ index 2fc6e210d..54f913901 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9dfba251e..36ca0f228 100644
index bc782e2f..ed42fe32 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -97,6 +97,11 @@ public class PurpurWorldConfig {
@@ -99,6 +99,11 @@ public class PurpurWorldConfig {
campfiresGoOutInRain = getBoolean("campfires-go-out-in-rain", campfiresGoOutInRain);
}

8
patches/server/0038-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -1,4 +1,4 @@
From 11e79d9d33beda063a57049939737f87d56580b1 Mon Sep 17 00:00:00 2001
From 8b062a53f9506ad448ddab046f2f241d96dec569 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 10 Jul 2019 20:43:05 -0500
Subject: [PATCH] Option to toggle milk curing bad omen
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
2 files changed, 7 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
index a6477d26a..f76e611ca 100644
index a6477d26..f76e611c 100644
--- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
+++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
@@ -20,7 +20,9 @@ public class ItemMilkBucket extends Item {
@@ -23,10 +23,10 @@ index a6477d26a..f76e611ca 100644
return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 36ca0f228..a3f93485b 100644
index ed42fe32..1a9b1289 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,4 +111,9 @@ public class PurpurWorldConfig {
@@ -113,4 +113,9 @@ public class PurpurWorldConfig {
private void itemsCanBreakTurtleEggs() {
itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
}

8
patches/server/0044-Implement-a-hard-limit-for-pillager-outpost-spawns.patch
View File

@@ -1,4 +1,4 @@
From 878f46588f40c083ede79636abf7da2da89ab0fb Mon Sep 17 00:00:00 2001
From 4cfdfc4bf31e03c294d8b7d1c5e9563b5c6dd4d5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 14:24:26 -0500
Subject: [PATCH] Implement a hard limit for pillager outpost spawns
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement a hard limit for pillager outpost spawns
2 files changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
index b794a39d3..39159e34a 100644
index b794a39d..39159e34 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
@@ -142,6 +142,7 @@ public class ChunkProviderGenerate extends ChunkGeneratorAbstract<GeneratorSetti
@@ -21,10 +21,10 @@ index b794a39d3..39159e34a 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a3f93485b..9200c439b 100644
index 1a9b1289..fa24cee0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,4 +116,9 @@ public class PurpurWorldConfig {
@@ -118,4 +118,9 @@ public class PurpurWorldConfig {
private void milkCuresBadOmen() {
milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
}

8
patches/server/0045-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -1,4 +1,4 @@
From 7067491a7ee804e88d8535a638f1f2e27b161041 Mon Sep 17 00:00:00 2001
From b91282cffd67895d43061798a14c7c378d6c9edf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 17:32:17 -0500
Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
2 files changed, 8 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index c2ccb8589..70e8a422a 100644
index c2ccb858..70e8a422 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -886,6 +886,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -22,10 +22,10 @@ index c2ccb8589..70e8a422a 100644
int i = 0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9200c439b..489083928 100644
index fa24cee0..83e26324 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -121,4 +121,11 @@ public class PurpurWorldConfig {
@@ -123,4 +123,11 @@ public class PurpurWorldConfig {
private void limitPillagerOutpostSpawns() {
limitPillagerOutpostSpawns = getInt("limit-pillager-outpost-spawns", limitPillagerOutpostSpawns);
}

8
patches/server/0048-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From e6a9f0d798945c4028a397440f68dadd2c62a28d Mon Sep 17 00:00:00 2001
From 65faec0d7231fcc6398d09453e4ce4cf4632014b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 25 Jul 2019 18:07:37 -0500
Subject: [PATCH] Implement elytra settings
@@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings
6 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 84aebb91..1ad2176e 100644
index 14972386..ab30648a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2588,9 +2588,16 @@ public abstract class EntityLiving extends Entity {
@@ -123,10 +123,10 @@ index d2eb861a..b89f9fe7 100644
return this.x * this.x + this.y * this.y + this.z * this.z;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 48908392..b235c876 100644
index 83e26324..07d07a5e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -128,4 +128,17 @@ public class PurpurWorldConfig {
@@ -130,4 +130,17 @@ public class PurpurWorldConfig {
radiusVillagerIronGolemSpawns = getInt("radius-villager-iron-golem-spawns", radiusVillagerIronGolemSpawns);
limitVillagerIronGolemSpawns = getInt("limit-villager-iron-golem-spawns", limitVillagerIronGolemSpawns);
}