Skip to content

Fix erosion sync flooding on player login #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaiserproger wants to merge 1 commit into
base: 1.20.1-forge
Choose a base branch
from
Open

Fix erosion sync flooding on player login #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/milkucha/trmt/TRMTForgeEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.level.BlockEvent;
import net.minecraftforge.event.level.ChunkWatchEvent;
import net.minecraftforge.event.server.ServerStartedEvent;
import net.minecraftforge.event.server.ServerStoppedEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
Expand Down Expand Up @@ -48,11 +49,15 @@ public static void onServerStopped(ServerStoppedEvent event) {
@SubscribeEvent
public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
if (event.getEntity() instanceof ServerPlayer player) {
ErosionMapManager.getInstance().sendFullSyncToPlayer(player);
TRMTNetwork.sendVersionCheck(player);
}
}

@SubscribeEvent
public static void onChunkWatch(ChunkWatchEvent.Watch event) {
ErosionMapManager.getInstance().sendChunkSyncToPlayer(event.getPlayer(), event.getPos());
}

@SubscribeEvent
public static void onBlockBreak(BlockEvent.BreakEvent event) {
ErosionMapManager.getInstance().removeEntry(event.getPos());
Expand Down
33 changes: 16 additions & 17 deletions src/main/java/milkucha/trmt/erosion/ErosionMapManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,25 +243,24 @@ public Map<ChunkPos, ChunkErosionMap> getAllChunkMaps() {

// --- Networking ---

public void sendFullSyncToPlayer(ServerPlayer player) {
public void sendChunkSyncToPlayer(ServerPlayer player, ChunkPos chunkPos) {
if (state == null) return;
for (Map.Entry<ChunkPos, ChunkErosionMap> chunkEntry : state.getAllChunkMaps().entrySet()) {
ChunkPos chunkPos = chunkEntry.getKey();
Map<BlockPos, ErosionEntry> entries = chunkEntry.getValue().getEntries();
if (entries.isEmpty()) continue;

List<TRMTNetwork.SyncChunkMessage.Entry> payloadEntries = new ArrayList<>(entries.size());
for (Map.Entry<BlockPos, ErosionEntry> e : entries.entrySet()) {
payloadEntries.add(new TRMTNetwork.SyncChunkMessage.Entry(
e.getKey(),
e.getValue().getErosionStage(),
e.getValue().getWalkedOnCount(),
e.getValue().getThreshold(),
e.getValue().getLastTouchedGameTime()
));
}
TRMTNetwork.sendSyncChunk(player, chunkPos.x, chunkPos.z, payloadEntries);

ChunkErosionMap map = state.getChunkMap(chunkPos);
Map<BlockPos, ErosionEntry> entries = map != null ? map.getEntries() : Collections.emptyMap();
List<TRMTNetwork.SyncChunkMessage.Entry> payloadEntries = new ArrayList<>(entries.size());

for (Map.Entry<BlockPos, ErosionEntry> e : entries.entrySet()) {
payloadEntries.add(new TRMTNetwork.SyncChunkMessage.Entry(
e.getKey(),
e.getValue().getErosionStage(),
e.getValue().getWalkedOnCount(),
e.getValue().getThreshold(),
e.getValue().getLastTouchedGameTime()
));
}

TRMTNetwork.sendSyncChunk(player, chunkPos.x, chunkPos.z, payloadEntries);
}

private void broadcastStageUpdate(BlockPos pos, int stage, float walkedOnCount, float threshold, long lastTouchedGameTime) {
Expand Down