Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-06 15:51:33 +00:00
Code Issues Releases Activity

Fix villagers dont release memory

Browse Source
This commit is contained in:
violetc
2023-07-22 12:02:21 +08:00
parent db194faf86
commit aff95ee0dc
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0004-Leaves-Server-Config-And-Command.patch
View File

@@ -128,10 +128,10 @@ index 35d2da9d91dcdd89de7c0f4af028fd182376ea8d..d73482fb1e71fe2951e96ae0593de268
.withRequiredArg()
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..28c18d02a1d04582e6f0badbc9917e6356bf8532
index 0000000000000000000000000000000000000000..63bbea2329202aef8f0d08c74d950276ccb4344c
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -0,0 +1,936 @@
@@ -0,0 +1,941 @@
+package top.leavesmc.leaves;
+
+import com.destroystokyo.paper.util.SneakyThrow;
@@ -893,6 +893,11 @@ index 0000000000000000000000000000000000000000..28c18d02a1d04582e6f0badbc9917e63
+ skipNegligiblePlanarMovementMultiplication = getBoolean("settings.performance.skip-negligible-planar-movement-multiplication", skipNegligiblePlanarMovementMultiplication);
+ }
+
+ public static boolean villagersDontReleaseMemoryFix = false;
+ private static void villagersDontReleaseMemoryFix() {
+ villagersDontReleaseMemoryFix = getBoolean("settings.performance.fix-villagers-dont-release-memory", villagersDontReleaseMemoryFix);
+ }
+
+ public static final class WorldConfig {
+
+ public final String worldName;

31
patches/server/0111-Fix-villagers-dont-release-memory.patch Normal file
View File

@@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Sat, 22 Jul 2023 12:00:59 +0800
Subject: [PATCH] Fix villagers dont release memory
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 79bfd7b5da13197c2d3f7dbf9c3154dd783d1ba8..3e36b1f0d8f18de7afe7a1db6cf3a695b7d7a58c 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -1076,4 +1076,20 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
return optional.isPresent() ? worldTime - (Long) optional.get() < 24000L : false;
}
+
+ // Leaves start - fixes a memory leak when villagers get moved to another world
+ @Nullable
+ @Override
+ public Entity changeDimension(ServerLevel destination) {
+ if (top.leavesmc.leaves.LeavesConfig.villagersDontReleaseMemoryFix) {
+ this.releaseAllPois();
+ this.getBrain().eraseMemory(MemoryModuleType.HOME);
+ this.getBrain().eraseMemory(MemoryModuleType.JOB_SITE);
+ this.getBrain().eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
+ this.getBrain().eraseMemory(MemoryModuleType.MEETING_POINT);
+ this.refreshBrain(destination);
+ }
+ return super.changeDimension(destination);
+ }
+ // Leaves end - fixes a memory leak when villagers get moved to another world
}