icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2021-04-10 15:09:14 -03:00
2 parents 37a6913e72 cd9a5b96c2
commit ffcc269f3a
2 files changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/helpers/TickSpeed.java
+1
View File
@@ -74,6 +74,7 @@ public class TickSpeed
if (player_active_timeout < PLAYER_GRACE) if (player_active_timeout < PLAYER_GRACE)
{ {
player_active_timeout = PLAYER_GRACE; player_active_timeout = PLAYER_GRACE;
ServerNetworkHandler.updateTickPlayerActiveTimeoutToConnectedPlayers();
} }
} }
src/main/java/carpet/mixins/World_tickMixin.java
+4 -1
View File
@@ -9,7 +9,9 @@ import net.minecraft.entity.EntityType;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.profiler.Profiler; import net.minecraft.util.profiler.Profiler;
import net.minecraft.world.World; import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; 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.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
@@ -24,6 +26,7 @@ import java.util.function.Consumer;
@Mixin(World.class) @Mixin(World.class)
public abstract class World_tickMixin implements WorldInterface public abstract class World_tickMixin implements WorldInterface
{ {
@Shadow @Final public boolean isClient;
CarpetProfiler.ProfilerToken currentSection; CarpetProfiler.ProfilerToken currentSection;
CarpetProfiler.ProfilerToken entitySection; CarpetProfiler.ProfilerToken entitySection;
@@ -79,7 +82,7 @@ public abstract class World_tickMixin implements WorldInterface
@Inject(method = "tickEntity", at = @At("HEAD"), cancellable = true) @Inject(method = "tickEntity", at = @At("HEAD"), cancellable = true)
private void startEntity(Consumer<Entity> consumer_1, Entity e, CallbackInfo ci) private void startEntity(Consumer<Entity> consumer_1, Entity e, CallbackInfo ci)
{ {
if (!TickSpeed.process_entities && !(e instanceof PlayerEntity)) if (!(TickSpeed.process_entities || (e instanceof PlayerEntity) || (TickSpeed.is_superHot && isClient && e.getPrimaryPassenger() instanceof PlayerEntity)))
ci.cancel(); ci.cancel();
entitySection = CarpetProfiler.start_entity_section((World) (Object) this, e, CarpetProfiler.TYPE.ENTITY); entitySection = CarpetProfiler.start_entity_section((World) (Object) this, e, CarpetProfiler.TYPE.ENTITY);
} }