From 77f8d2cbd73b9ab7daa6a206082724ae975e5230 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 11 Jan 2022 23:57:50 +0100 Subject: [PATCH] update issues --- .../java/carpet/mixins/PlayerManager_fakePlayersMixin.java | 2 +- src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java | 3 ++- src/main/java/carpet/script/utils/BiomeInfo.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java b/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java index bd1f3733..ad3035c6 100644 --- a/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java +++ b/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java @@ -62,7 +62,7 @@ public abstract class PlayerManager_fakePlayersMixin @Inject(method = "createPlayer", at = @At(value = "INVOKE", shift = At.Shift.BEFORE, target = "Ljava/util/Iterator;hasNext()Z"), locals = LocalCapture.CAPTURE_FAILHARD) private void newWhileLoop(GameProfile gameProfile_1, CallbackInfoReturnable cir, UUID uUID_1, - List list_1, Iterator var5) + List list_1, ServerPlayerEntity player, Iterator var5) { while (var5.hasNext()) { diff --git a/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java b/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java index cb5277ed..7a5ad342 100644 --- a/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java +++ b/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java @@ -4,6 +4,7 @@ import carpet.CarpetSettings; import carpet.fakes.ServerWorldInterface; import carpet.script.CarpetEventServer; import net.minecraft.entity.Entity; +import net.minecraft.world.LocalDifficulty; import net.minecraft.world.entity.EntityLike; import net.minecraft.entity.LightningEntity; import net.minecraft.entity.damage.DamageSource; @@ -41,7 +42,7 @@ public class ServerWorld_scarpetMixin implements ServerWorldInterface )) private void onNaturalLightinig(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci, //ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, boolean bl2) - ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, boolean bl2, LightningEntity lightningEntity) + ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, LocalDifficulty localDifficulty, boolean bl2, LightningEntity lightningEntity) { if (LIGHTNING.isNeeded()) LIGHTNING.onWorldEventFlag((ServerWorld) (Object)this, blockPos, bl2?1:0); } diff --git a/src/main/java/carpet/script/utils/BiomeInfo.java b/src/main/java/carpet/script/utils/BiomeInfo.java index ee9f9524..0253e184 100644 --- a/src/main/java/carpet/script/utils/BiomeInfo.java +++ b/src/main/java/carpet/script/utils/BiomeInfo.java @@ -1,6 +1,5 @@ package carpet.script.utils; -import carpet.fakes.BiomeEffectsInterface; import carpet.fakes.PlacedFeatureInterface; import carpet.script.value.BlockValue; import carpet.script.value.ListValue;