Skip to content
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

Jump to bottom

Fix Laser Pipe Client Desync + Small Rework #2245

Merged
merged 2 commits into from
Dec 3, 2023
Merged

Fix Laser Pipe Client Desync + Small Rework #2245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
808898e
add initial sync data
ghzdude Dec 3, 2023
ff2c03c
spotless
ghzdude Dec 3, 2023
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
60 changes: 38 additions & 22 deletions src/main/java/gregtech/common/pipelike/laser/tile/TileEntityLaserPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,32 +156,29 @@ public boolean isActive() {
* @param duration how long the pipe should be active for
*/
public void setActive(boolean active, int duration) {
boolean stateChanged = false;
if (this.isActive && !active) {
this.isActive = false;
stateChanged = true;
} else if (!this.isActive && active) {
this.isActive = true;
stateChanged = true;
activeDuration = duration;
TaskScheduler.scheduleTask(getWorld(), () -> {
if (++this.ticksActive % activeDuration == 0) {
this.ticksActive = 0;
setActive(false, -1);
return false;
}
return true;
});
} else if (this.isActive) {
if (this.isActive != active) {
this.isActive = active;
notifyBlockUpdate();
markDirty();
writeCustomData(GregtechDataCodes.PIPE_LASER_ACTIVE, buf -> buf.writeBoolean(this.isActive));
if (active && duration != this.activeDuration) {
TaskScheduler.scheduleTask(getWorld(), this::queueDisconnect);
}
}

this.activeDuration = duration;
if (duration > 0 && active) {
this.ticksActive = 0;
this.activeDuration = duration;
}
}

if (stateChanged) {
writeCustomData(GregtechDataCodes.PIPE_LASER_ACTIVE, buf -> buf.writeBoolean(this.isActive));
notifyBlockUpdate();
markDirty();
public boolean queueDisconnect() {
if (++this.ticksActive % activeDuration == 0) {
this.ticksActive = 0;
setActive(false, -1);
return false;
}
return true;
}

@Override
Expand All @@ -193,6 +190,25 @@ public void receiveCustomData(int discriminator, PacketBuffer buf) {
}
}

@Override
public void writeInitialSyncData(PacketBuffer buf) {
super.writeInitialSyncData(buf);
buf.writeBoolean(this.isActive);

// schedule a disconnect on world load, gotta set the duration to something
if (isActive) {
activeDuration = 100;
TaskScheduler.scheduleTask(getWorld(), this::queueDisconnect);
}
}

@Override
public void receiveInitialSyncData(PacketBuffer buf) {
super.receiveInitialSyncData(buf);
this.isActive = buf.readBoolean();
scheduleChunkForRenderUpdate();
}

@NotNull
@Override
public NBTTagCompound writeToNBT(@NotNull NBTTagCompound compound) {
Expand Down