update new loader issues

This commit is contained in:
gnembon committed 2022-01-12 23:24:23 +01:00
1 parent 068a42292f
commit b46a4d9668
3 files changed
+6 -5

No files matched your search

+3 -3
View File
@@ -217,11 +217,11 @@ public class CarpetSettings
return newValue;
}
}
if (newValue.equals("false")) {
if (newValue.equalsIgnoreCase("false")) {
shulkerBoxStackSize = 1;
return newValue;
}
if (newValue.equals("true")) {
if (newValue.equalsIgnoreCase("true")) {
shulkerBoxStackSize = 64;
return newValue;
}
@@ -236,7 +236,7 @@ public class CarpetSettings
}
@Rule(
desc = "Empty shulker boxes can stack to 64 or a custom value when thrown on the ground.",
desc = "Empty shulker boxes can stack when thrown on the ground.",
extra = ".. or when manipulated inside the inventories",
validate = StackableShulkerBoxValidator.class,
options = {"false", "true", "16"},
@@ -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<ServerPlayerEntity> cir, UUID uUID_1,
List list_1, Iterator var5)
List list_1, ServerPlayerEntity serverPlayerEntity, Iterator var5)
{
while (var5.hasNext())
{
@@ -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);
}