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

fixes #712

Browse Source
This commit is contained in:
gnembon committed 2021-02-16 11:03:05 -04:00
1 parent 0e0a4cc0f2
commit 6a43ee25c7
1 file changed
+13 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java
+13 -7
View File
@@ -1,6 +1,8 @@
package carpet.mixins; package carpet.mixins;
import carpet.CarpetServer;
import carpet.CarpetSettings; import carpet.CarpetSettings;
import carpet.network.CarpetClient;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.c2s.play.UpdateStructureBlockC2SPacket; import net.minecraft.network.packet.c2s.play.UpdateStructureBlockC2SPacket;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -23,7 +25,7 @@ public class UpdateStructureBlockC2SPacketMixin {
at = @At("TAIL") at = @At("TAIL")
) )
private void structureBlockLimitsRead(PacketByteBuf buf, CallbackInfo ci) { private void structureBlockLimitsRead(PacketByteBuf buf, CallbackInfo ci) {
if (buf.readableBytes() > 0) { if (buf.readableBytes() == 6*4) {
// This will throw an exception if carpet is not installed on client // This will throw an exception if carpet is not installed on client
offset = new BlockPos(MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit)); offset = new BlockPos(MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit));
size = new BlockPos(MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit)); size = new BlockPos(MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit));
@@ -35,11 +37,15 @@ public class UpdateStructureBlockC2SPacketMixin {
at = @At("TAIL") at = @At("TAIL")
) )
private void structureBlockLimitsWrite(PacketByteBuf buf, CallbackInfo ci) { private void structureBlockLimitsWrite(PacketByteBuf buf, CallbackInfo ci) {
buf.writeInt(this.offset.getX()); //client method, only applicable if with carpet is on the server, or running locally
buf.writeInt(this.offset.getY()); if (CarpetClient.isCarpet() || CarpetServer.minecraft_server != null)
buf.writeInt(this.offset.getZ()); {
buf.writeInt(this.size.getX()); buf.writeInt(this.offset.getX());
buf.writeInt(this.size.getY()); buf.writeInt(this.offset.getY());
buf.writeInt(this.size.getZ()); buf.writeInt(this.offset.getZ());
buf.writeInt(this.size.getX());
buf.writeInt(this.size.getY());
buf.writeInt(this.size.getZ());
}
} }
} }