Further fixes MC-128547
This commit is contained in:
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ package io.akarin.server.mixin.core;
|
|||||||
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Overwrite;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
|
||||||
import net.minecraft.server.DamageSource;
|
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, Iterable<ItemStack> iterable) {}
|
||||||
@Shadow private static void a(EnchantmentManager.EnchantmentModifier modifier, ItemStack itemstack) {}
|
@Shadow private static void a(EnchantmentManager.EnchantmentModifier modifier, ItemStack itemstack) {}
|
||||||
|
|
||||||
|
@Overwrite
|
||||||
public static int a(Iterable<ItemStack> iterable, DamageSource damageSource) {
|
public static int a(Iterable<ItemStack> iterable, DamageSource damageSource) {
|
||||||
EnchantmentManager.a.a = 0; // PAIL: damageModifier
|
EnchantmentManager.a.a = 0; // PAIL: damageModifier
|
||||||
EnchantmentManager.a.b = damageSource;
|
EnchantmentManager.a.b = damageSource;
|
||||||
@@ -55,6 +57,7 @@ public class WeakEnchantmentManager {
|
|||||||
return EnchantmentManager.a.a;
|
return EnchantmentManager.a.a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Overwrite
|
||||||
public static void a(EntityLiving user, Entity attacker) { // PAIL: applyThornEnchantments
|
public static void a(EntityLiving user, Entity attacker) { // PAIL: applyThornEnchantments
|
||||||
EnchantmentManager.c.b = attacker;
|
EnchantmentManager.c.b = attacker;
|
||||||
EnchantmentManager.c.a = user;
|
EnchantmentManager.c.a = user;
|
||||||
@@ -72,6 +75,7 @@ public class WeakEnchantmentManager {
|
|||||||
// SAkarin end
|
// SAkarin end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Overwrite
|
||||||
public static void b(EntityLiving user, Entity target) { // PAIL: applyArthropodEnchantments
|
public static void b(EntityLiving user, Entity target) { // PAIL: applyArthropodEnchantments
|
||||||
EnchantmentManager.d.a = user;
|
EnchantmentManager.d.a = user;
|
||||||
EnchantmentManager.d.b = target;
|
EnchantmentManager.d.b = target;
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
"bootstrap.MetricsBootstrap",
|
"bootstrap.MetricsBootstrap",
|
||||||
|
|
||||||
"core.MixinMCUtil",
|
"core.MixinMCUtil",
|
||||||
|
"core.WeakBigTree",
|
||||||
"core.DesyncCatcher",
|
"core.DesyncCatcher",
|
||||||
"core.MixinCraftServer",
|
"core.MixinCraftServer",
|
||||||
"core.MixinVersionCommand",
|
"core.MixinVersionCommand",
|
||||||
|
|||||||
Reference in New Issue
Block a user