Skip to content

Commit 84e27a7

Browse files
committed
Fix ender dragon model leaking client world
1 parent 7f44701 commit 84e27a7

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package org.embeddedt.modernfix.common.mixin.bugfix.ender_dragon_leak;
2+
3+
import net.minecraft.client.renderer.entity.EnderDragonRenderer;
4+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
5+
import org.spongepowered.asm.mixin.Final;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.Shadow;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
11+
12+
@Mixin(EnderDragonRenderer.class)
13+
@ClientOnlyMixin
14+
public abstract class EnderDragonRendererMixin {
15+
@Shadow @Final private EnderDragonRenderer.DragonModel model;
16+
17+
/**
18+
* Prevent leaking the client world through the entity reference.
19+
*/
20+
@Inject(method = "render(Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At("RETURN"))
21+
private void clearDragonEntityReference(CallbackInfo ci) {
22+
this.model.entity = null;
23+
}
24+
}

common/src/main/resources/modernfix.accesswidener

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ accessible field net/minecraft/client/renderer/block/model/BlockModel GSON Lcom/
2929
accessible field net/minecraft/server/MinecraftServer resources Lnet/minecraft/server/ServerResources;
3030
accessible field net/minecraft/client/renderer/RenderStateShard name Ljava/lang/String;
3131
accessible method net/minecraft/client/gui/screens/Screen addButton (Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;
32-
accessible field net/minecraft/server/packs/resources/SimpleReloadableResourceManager namespacedPacks Ljava/util/Map;
32+
accessible field net/minecraft/server/packs/resources/SimpleReloadableResourceManager namespacedPacks Ljava/util/Map;
33+
accessible field net/minecraft/client/renderer/entity/EnderDragonRenderer$DragonModel entity Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;

0 commit comments

Comments
 (0)