Skip to content

Commit 5d33805

Browse files
committed
Merge 1.19.2 into 1.19.4
2 parents 512ed02 + 82445d2 commit 5d33805

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map;
3939
accessible field net/minecraft/client/renderer/block/model/multipart/MultiPart definition Lnet/minecraft/world/level/block/state/StateDefinition;
4040
accessible field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel;
4141
mutable field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel;
42+
accessible field net/minecraft/client/renderer/entity/EnderDragonRenderer$DragonModel entity Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;

0 commit comments

Comments
 (0)