From b1af713f0c24b2bcff51e1415e0778e611c3e199 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Sat, 9 Jun 2018 19:01:41 +0800
Subject: [PATCH] Further fixes MC-128547

---
 .../akarin/server/mixin/core/WeakBigTree.java | 23 +++++++++++++++++++
 .../mixin/core/WeakEnchantmentManager.java    |  4 ++++
 .../main/resources/mixins.akarin.core.json    |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 sources/src/main/java/io/akarin/server/mixin/core/WeakBigTree.java

diff --git a/sources/src/main/java/io/akarin/server/mixin/core/WeakBigTree.java b/sources/src/main/java/io/akarin/server/mixin/core/WeakBigTree.java
new file mode 100644
index 000000000..f902ee027
--- /dev/null
+++ b/sources/src/main/java/io/akarin/server/mixin/core/WeakBigTree.java
@@ -0,0 +1,23 @@
+package io.akarin.server.mixin.core;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.server.World;
+import net.minecraft.server.WorldGenBigTree;
+
+/**
+ * Fixes MC-128547(https://bugs.mojang.com/browse/MC-128547)
+ */
+@Mixin(value = WorldGenBigTree.class, remap = false)
+public class WeakBigTree {
+    @Shadow private World l;
+    
+    @Inject(method = "generate(Lnet/minecraft/server/World;Ljava/util/Random;Lnet/minecraft/server/BlockPosition;)Z", at = @At("RETURN"))
+    private void clearWorldRef(CallbackInfo info) {
+        l = null; // Akarin - remove references to world objects to avoid memory leaks
+    }
+}
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/WeakEnchantmentManager.java b/sources/src/main/java/io/akarin/server/mixin/core/WeakEnchantmentManager.java
index 948177739..406fc8e3a 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/WeakEnchantmentManager.java
+++ b/sources/src/main/java/io/akarin/server/mixin/core/WeakEnchantmentManager.java
@@ -26,6 +26,7 @@ package io.akarin.server.mixin.core;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.server.DamageSource;
@@ -47,6 +48,7 @@ public class WeakEnchantmentManager {
     @Shadow private static void a(EnchantmentManager.EnchantmentModifier modifier, Iterable<ItemStack> iterable) {}
     @Shadow private static void a(EnchantmentManager.EnchantmentModifier modifier, ItemStack itemstack) {}
     
+    @Overwrite
     public static int a(Iterable<ItemStack> iterable, DamageSource damageSource) {
         EnchantmentManager.a.a = 0; // PAIL: damageModifier
         EnchantmentManager.a.b = damageSource;
@@ -55,6 +57,7 @@ public class WeakEnchantmentManager {
         return EnchantmentManager.a.a;
     }
     
+    @Overwrite
     public static void a(EntityLiving user, Entity attacker) { // PAIL: applyThornEnchantments
         EnchantmentManager.c.b = attacker;
         EnchantmentManager.c.a = user;
@@ -72,6 +75,7 @@ public class WeakEnchantmentManager {
         // SAkarin end
     }
 
+    @Overwrite
     public static void b(EntityLiving user, Entity target) { // PAIL: applyArthropodEnchantments
         EnchantmentManager.d.a = user;
         EnchantmentManager.d.b = target;
diff --git a/sources/src/main/resources/mixins.akarin.core.json b/sources/src/main/resources/mixins.akarin.core.json
index ddbdeb619..99c06982d 100644
--- a/sources/src/main/resources/mixins.akarin.core.json
+++ b/sources/src/main/resources/mixins.akarin.core.json
@@ -13,6 +13,7 @@
         "bootstrap.MetricsBootstrap",
         
         "core.MixinMCUtil",
+        "core.WeakBigTree",
         "core.DesyncCatcher",
         "core.MixinCraftServer",
         "core.MixinVersionCommand",