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

Add option to only use brain ticks setting when lagging

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-23 10:18:21 -05:00
parent 637e5469a2
commit c2720f58c2
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0061-Implement-lagging-threshold.patch → patches/server/0060-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From e8f673e15dac66aa35d517bfc81a83635e96d6a6 Mon Sep 17 00:00:00 2001 From cc1a5e544d859ccce9b4462070864188d13997b3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500 Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold Subject: [PATCH] Implement lagging threshold
@@ -30,7 +30,7 @@ index c5e89790fc..bfd1a9a809 100644
tickSection = curTime; tickSection = curTime;
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4943f48efd..eeb98ed666 100644 index d8321e8ec3..14450651cb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -138,9 +138,11 @@ public class PurpurConfig { @@ -138,9 +138,11 @@ public class PurpurConfig {

25
patches/server/0060-Implement-configurable-villager-brain-ticks.patch → patches/server/0061-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,15 +1,15 @@
From d96f2d09d32e6c330b0c7344ee530cc699b81441 Mon Sep 17 00:00:00 2001 From ba81b317d984abec1c5bbe377c5122b5e594c126 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 08:28:21 -0500 Date: Tue, 23 Jul 2019 08:28:21 -0500
Subject: [PATCH] Implement configurable villager brain ticks Subject: [PATCH] Implement configurable villager brain ticks
--- ---
src/main/java/net/minecraft/server/EntityVillager.java | 3 +++ src/main/java/net/minecraft/server/EntityVillager.java | 6 ++++++
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++
2 files changed, 8 insertions(+) 2 files changed, 13 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index c3bbf49978..afba9c36c9 100644 index c3bbf49978..53a50b4a40 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java --- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -28,25 +28,30 @@ index c3bbf49978..afba9c36c9 100644
} }
@Override @Override
@@ -145,6 +147,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -145,6 +147,10 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Override @Override
protected void mobTick() { protected void mobTick() {
this.world.getMethodProfiler().enter("brain"); this.world.getMethodProfiler().enter("brain");
+ if ((world.getTime() + brainTickOffset) % net.pl3x.purpur.PurpurConfig.villagerBrainTicks == 0) // Purpur + // Purpur start
+ boolean tick = (world.getTime() + brainTickOffset) % net.pl3x.purpur.PurpurConfig.villagerBrainTicks == 0;
+ if (((WorldServer) world).getMinecraftServer().lagging ? tick : net.pl3x.purpur.PurpurConfig.useVillagerBrainTicksOnlyWhenLagging || tick)
+ // Purpur end
this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error
this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().exit();
if (!this.dY() && this.bE > 0) { if (!this.dY() && this.bE > 0) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d8321e8ec3..4943f48efd 100644 index 14450651cb..08475aa6fc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -207,6 +207,11 @@ public class PurpurConfig { @@ -209,6 +209,13 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack); snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
} }
+ public static boolean useVillagerBrainTicksOnlyWhenLagging = true;
+ public static int villagerBrainTicks = 20; + public static int villagerBrainTicks = 20;
+ private static void villagerSettings() { + private static void villagerSettings() {
+ villagerBrainTicks = getInt("settings.mobs.brain-ticks", villagerBrainTicks); + useVillagerBrainTicksOnlyWhenLagging = getBoolean("settings.mobs.villager.use-brain-ticks-only-when-lagging", useVillagerBrainTicksOnlyWhenLagging);
+ villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
+ } + }
+ +
public static boolean largeEnderChests = true; public static boolean largeEnderChests = true;