mirror of
https://github.com/LeavesMC/Leaves.git
synced 2026-01-04 15:41:31 +00:00
c5ecbe85d2
--------- Co-authored-by: MC-XiaoHei <xor7xiaohei@gmail.com> Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> Co-authored-by: Fortern <blueten.ki@gmail.com> Co-authored-by: Helvetica Volubi <88063803+Suisuroru@users.noreply.github.com>
44 lines
2.4 KiB
Diff
44 lines
2.4 KiB
Diff
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/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
|
index 39c80b858b6bb94949fb7d2fb8347a7a628cb65f..2d97fc7b51f89c323dd893f2407125b1e8bd79fb 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -4032,7 +4032,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
return this;
|
|
}
|
|
|
|
- private Entity teleportCrossDimension(ServerLevel oldLevel, ServerLevel newLevel, TeleportTransition teleportTransition) {
|
|
+ protected Entity teleportCrossDimension(ServerLevel oldLevel, ServerLevel newLevel, TeleportTransition teleportTransition) { // Leaves - private -> protected
|
|
List<Entity> passengers = this.getPassengers();
|
|
List<Entity> list = new ArrayList<>(passengers.size());
|
|
this.ejectPassengers();
|
|
diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
|
|
index e1e2bdb35866a8f32a41f6efd24ad77cf916b2e9..22ef2d7bc8f514bf5a7a1f2fdb9a05a256378c5e 100644
|
|
--- a/net/minecraft/world/entity/npc/Villager.java
|
|
+++ b/net/minecraft/world/entity/npc/Villager.java
|
|
@@ -1033,4 +1033,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
|
return super.applyImplicitComponent(component, value);
|
|
}
|
|
}
|
|
+
|
|
+ // Leaves start - fixes a memory leak when villagers get moved to another world
|
|
+ @Override
|
|
+ public Entity teleportCrossDimension(ServerLevel oldWorld, ServerLevel newWorld, net.minecraft.world.level.portal.TeleportTransition transition) {
|
|
+ if (org.leavesmc.leaves.LeavesConfig.performance.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(transition.newLevel());
|
|
+ }
|
|
+ return super.teleportCrossDimension(oldWorld, newWorld, transition);
|
|
+ }
|
|
+ // Leaves end - fixes a memory leak when villagers get moved to another world
|
|
}
|