Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Further fixes MC-128547

Browse Source
This commit is contained in:
Sotr
2018-06-09 19:01:41 +08:00
parent f4d5156ba7
commit b1af713f0c
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sources/src/main/java/io/akarin/server/mixin/core/WeakBigTree.java Normal file
View File

@@ -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
}
}

4
sources/src/main/java/io/akarin/server/mixin/core/WeakEnchantmentManager.java
View File

@@ -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;

1
sources/src/main/resources/mixins.akarin.core.json
View File

@@ -13,6 +13,7 @@
"bootstrap.MetricsBootstrap",
"core.MixinMCUtil",
"core.WeakBigTree",
"core.DesyncCatcher",
"core.MixinCraftServer",
"core.MixinVersionCommand",