AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 12:05:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP on ignoring unwanted positions after TPing, spawning a player

Browse Source
This commit is contained in:
Goodlyay 2024-02-15 23:32:19 -08:00
parent ffe4707394
commit 5ea3e77b56
4 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MCGalaxy/Network/ClassicProtocol.cs
View File

@ -259,10 +259,16 @@ namespace MCGalaxy.Network
bool serverToClient = buffer[offset + 1] != 0;
ushort data = NetUtils.ReadU16(buffer, offset + 2);
//player.Message("&bServerToClient? {0}, data {1}", serverToClient, data);
if (!serverToClient) {
// Client-> server ping, immediately send reply.
Send(Packet.TwoWayPing(false, data));
} else {
if (Ping.UnIgnorePosition(data)) {
player.IgnorePosition = false;
player.Message("Your position is no longer being ignored, received {0}", data);
}
// Server -> client ping, set time received for reply.
Ping.Update(data);
}
@ -358,6 +364,7 @@ namespace MCGalaxy.Network
if (id == Entities.SelfID) pos.Y -= 22;
Send(Packet.Teleport(id, pos, rot, player.hasExtPositions));
DoIgnorePositionPing(id);
}
public override bool SendTeleport(byte id, Position pos, Orientation rot,
Packet.TeleportMoveMode moveMode, bool usePos = true, bool interpolateOri = false, bool useOri = true) {
@ -368,8 +375,16 @@ namespace MCGalaxy.Network
{ pos.Y -= 22; }
Send(Packet.TeleportExt(id, usePos, moveMode, useOri, interpolateOri, pos, rot, player.hasExtPositions));
DoIgnorePositionPing(id);
return true;
}
void DoIgnorePositionPing(byte id) {
if (!hasTwoWayPing || id != Entities.SelfID) { return; }
ushort data = Ping.NextTwoWayPingData(true);
SendTwoWayPing(data);
player.IgnorePosition = true;
player.Message("Now ignoring your position until {0}", data);
}
public override void SendRemoveEntity(byte id) {
Send(Packet.RemoveEntity(id));
@ -521,11 +536,15 @@ namespace MCGalaxy.Network
public override void SendPing() {
if (hasTwoWayPing) {
Send(Packet.TwoWayPing(true, Ping.NextTwoWayPingData()));
SendTwoWayPing(Ping.NextTwoWayPingData());
} else {
Send(Packet.Ping());
}
}
void SendTwoWayPing(BlockID data) {
if (!hasTwoWayPing) { return; }
Send(Packet.TwoWayPing(true, data));
}
public override void SendSetSpawnpoint(Position pos, Orientation rot) {
if (Supports(CpeExt.SetSpawnpoint)) {
@ -559,6 +578,8 @@ namespace MCGalaxy.Network
} else {
Send(Packet.AddEntity(id, name, pos, rot, player.hasCP437, player.hasExtPositions));
}
DoIgnorePositionPing(id);
}
public override void SendLevel(Level prev, Level level) {

13
MCGalaxy/Network/Utils/PingList.cs
View File

@ -35,9 +35,17 @@ namespace MCGalaxy.Network
// Pings are stored using a circular array
public PingEntry[] Entries = new PingEntry[10];
int pingCounter, nextPingHead;
long ignorePositionData = -1;
public bool UnIgnorePosition(ushort data) {
if (Interlocked.Read(ref ignorePositionData) == data) {
Interlocked.Exchange(ref ignorePositionData, -1);
return true;
}
return false;
}
public ushort NextTwoWayPingData() {
public ushort NextTwoWayPingData(bool waitingForMovementAcknowledged = false) {
int pingValue = Interlocked.Increment(ref pingCounter);
int pingHead = (Interlocked.Increment(ref nextPingHead) - 1) % 10;
@ -45,6 +53,7 @@ namespace MCGalaxy.Network
Entries[pingHead].TimeRecv = default(DateTime);
Entries[pingHead].TimeSent = DateTime.UtcNow;
if (waitingForMovementAcknowledged) Interlocked.Exchange(ref ignorePositionData, pingValue);
return (ushort)pingValue;
}

10
MCGalaxy/Player/Player.Fields.cs
View File

@ -15,6 +15,7 @@ permissions and limitations under the Licenses.
using System;
using System.Collections.Generic;
using System.Net;
using System.Threading;
using MCGalaxy.Drawing;
using MCGalaxy.Drawing.Brushes;
using MCGalaxy.Drawing.Transforms;
@ -109,6 +110,15 @@ namespace MCGalaxy {
public bool onTrain, trainInvincible;
int mbRecursion;
private long _ignorePosition = 0;
internal bool IgnorePosition {
get { return Interlocked.Read(ref _ignorePosition) > 0; }
set {
if (value) Interlocked.Exchange(ref _ignorePosition, 1);
else Interlocked.Exchange(ref _ignorePosition, 0);
}
}
public bool frozen;
public string following = "";
public string possess = "";

1
MCGalaxy/Player/Player.Handlers.cs
View File

@ -224,6 +224,7 @@ namespace MCGalaxy
public void ProcessMovement(int x, int y, int z, byte yaw, byte pitch, int held) {
if (held >= 0) ClientHeldBlock = (BlockID)held;
if (IgnorePosition) { return; }
if (trainGrab || following.Length > 0) { CheckBlocks(Pos, Pos); return; }
Position next = new Position(x, y, z);
CheckBlocks(Pos, next);