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

Fix teleporting self in 0.0.16-0.0.17 doing nothing

Browse Source
This commit is contained in:
UnknownShadow200 2022-02-21 19:55:11 +11:00
parent f211335d37
commit c4ba3b7e28
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MCGalaxy/Modules/Relay/RelayBot.cs
View File

@ -31,7 +31,7 @@ namespace MCGalaxy.Modules.Relay
public class RelayUser { public string ID, Nick; } public class RelayUser { public string ID, Nick; }
public delegate void OnDirectMessage(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel); public delegate void OnDirectMessage(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel);
/// <summary> Called when a user sends a message directly to the relay bot </summary> /// <summary> Called when an external communication service user sends a message directly to the relay bot </summary>
public sealed class OnDirectMessageEvent : IEvent<OnDirectMessage> public sealed class OnDirectMessageEvent : IEvent<OnDirectMessage>
{ {
public static void Call(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel) { public static void Call(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel) {
@ -47,7 +47,7 @@ namespace MCGalaxy.Modules.Relay
} }
public delegate void OnChannelMessage(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel); public delegate void OnChannelMessage(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel);
/// <summary> Called when a user sends a message to the given channel </summary> /// <summary> Called when an external communication service user sends a message to the given channel </summary>
public sealed class OnChannelMessageEvent : IEvent<OnChannelMessage> public sealed class OnChannelMessageEvent : IEvent<OnChannelMessage>
{ {
public static void Call(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel) { public static void Call(RelayBot bot, string channel, RelayUser user, string message, ref bool cancel) {

14
MCGalaxy/Network/ClassicProtocol.cs
View File

@ -320,6 +320,20 @@ namespace MCGalaxy.Network
#region Classic packet sending #region Classic packet sending
public void SendTeleport(byte id, Position pos, Orientation rot) { public void SendTeleport(byte id, Position pos, Orientation rot) {
// Some classic < 0.0.19 versions have issues with sending teleport packet with ID 255
// 0.0.16a - does nothing
// 0.0.17a - does nothing
// 0.0.18a - works fine (https://minecraft.fandom.com/wiki/Java_Edition_Classic_0.0.18a)
// Skins weren't implemented until 0.0.19a, so it's fine to spam send SpawnEntity packets
// (downside is that client's respawn position is also changed due to using SpawnEntity)
// Unfortunately, there is no easy way to tell the difference between 0.0.17a and 0.0.18a,
// so this workaround still affects 0.0.18 clients even though it is unnecessary
if (id == Entities.SelfID && player.ProtocolVersion < Server.VERSION_0019) {
// TODO keep track of 'last spawn name', in case self entity name was changed by OnEntitySpawnedEvent
SendSpawnEntity(id, player.color + player.truename, player.SkinName, pos, rot);
return;
}
// NOTE: Classic clients require offseting own entity by 22 units vertically // NOTE: Classic clients require offseting own entity by 22 units vertically
if (id == Entities.SelfID) pos.Y -= 22; if (id == Entities.SelfID) pos.Y -= 22;