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

Fix crashing of ClassicalSharp 0.4

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-23 16:09:17 +10:00
parent f30759285d
commit 7fde09b296
14 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MCGalaxy/Blocks/BlockDefinitions.cs
View File

@ -185,7 +185,7 @@ namespace MCGalaxy {
if (global && pl.level.CustomBlockDefs[raw] != GlobalDefs[raw]) continue; if (global && pl.level.CustomBlockDefs[raw] != GlobalDefs[raw]) continue;
pl.Send(def.MakeDefinePacket(pl)); pl.Send(def.MakeDefinePacket(pl));
if (pl.HasCpeExt(CpeExt.BlockPermissions)) if (pl.Supports(CpeExt.BlockPermissions))
pl.Send(Packet.BlockPermission(def.BlockID, pl.level.CanPlace, pl.level.CanDelete)); pl.Send(Packet.BlockPermission(def.BlockID, pl.level.CanPlace, pl.level.CanDelete));
} }
Save(global, level); Save(global, level);
@ -220,7 +220,7 @@ namespace MCGalaxy {
if (!global && pl.level != level) continue; if (!global && pl.level != level) continue;
if (global && pl.level.CustomBlockDefs[raw] != GlobalDefs[raw]) continue; if (global && pl.level.CustomBlockDefs[raw] != GlobalDefs[raw]) continue;
if (!pl.HasCpeExt(CpeExt.InventoryOrder)) continue; if (!pl.Supports(CpeExt.InventoryOrder)) continue;
pl.Send(Packet.SetInventoryOrder(raw, order)); pl.Send(Packet.SetInventoryOrder(raw, order));
} }
} }
@ -282,9 +282,9 @@ namespace MCGalaxy {
} }
public byte[] MakeDefinePacket(Player pl) { public byte[] MakeDefinePacket(Player pl) {
if (pl.HasCpeExt(CpeExt.BlockDefinitionsExt, 2) && Shape != 0) { if (pl.Supports(CpeExt.BlockDefinitionsExt, 2) && Shape != 0) {
return Packet.DefineBlockExt(this, true, pl.hasCP437); return Packet.DefineBlockExt(this, true, pl.hasCP437);
} else if (pl.HasCpeExt(CpeExt.BlockDefinitionsExt) && Shape != 0) { } else if (pl.Supports(CpeExt.BlockDefinitionsExt) && Shape != 0) {
return Packet.DefineBlockExt(this, false, pl.hasCP437); return Packet.DefineBlockExt(this, false, pl.hasCP437);
} else { } else {
return Packet.DefineBlock(this, pl.hasCP437); return Packet.DefineBlock(this, pl.hasCP437);

2
MCGalaxy/Blocks/BlockPerms.cs
View File

@ -69,7 +69,7 @@ namespace MCGalaxy.Blocks {
public static void ResendBlockPermissions(byte block) { public static void ResendBlockPermissions(byte block) {
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) { foreach (Player pl in players) {
if (!pl.HasCpeExt(CpeExt.BlockPermissions)) continue; if (!pl.Supports(CpeExt.BlockPermissions)) continue;
int count = pl.hasCustomBlocks ? Block.CpeCount : Block.OriginalCount; int count = pl.hasCustomBlocks ? Block.CpeCount : Block.OriginalCount;
if (block < count) { if (block < count) {

2
MCGalaxy/Chat/Colors.cs
View File

@ -92,7 +92,7 @@ namespace MCGalaxy {
List[col.Code] = col; List[col.Code] = col;
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player p in players) { foreach (Player p in players) {
if (!p.HasCpeExt(CpeExt.TextColors)) continue; if (!p.Supports(CpeExt.TextColors)) continue;
p.Send(Packet.SetTextColor(col)); p.Send(Packet.SetTextColor(col));
} }
SaveList(); SaveList();

2
MCGalaxy/Commands/CPE/CmdReachDistance.cs
View File

@ -38,7 +38,7 @@ namespace MCGalaxy.Commands.CPE {
if (packedDist > short.MaxValue) { if (packedDist > short.MaxValue) {
Player.Message(p, "\"{0}\", is too long a reach distance. Max is 1023 blocks.", message); Player.Message(p, "\"{0}\", is too long a reach distance. Max is 1023 blocks.", message);
} else if (!p.HasCpeExt(CpeExt.ClickDistance)) { } else if (!p.Supports(CpeExt.ClickDistance)) {
Player.Message(p, "Your client doesn't support changing your reach distance."); Player.Message(p, "Your client doesn't support changing your reach distance.");
} else { } else {
p.Send(Packet.ClickDistance((short)packedDist)); p.Send(Packet.ClickDistance((short)packedDist));

2
MCGalaxy/CorePlugin/ConnectHandler.cs
View File

@ -55,7 +55,7 @@ namespace MCGalaxy.Core {
if (!short.TryParse(reach, out reachDist)) return; if (!short.TryParse(reach, out reachDist)) return;
p.ReachDistance = reachDist / 32f; p.ReachDistance = reachDist / 32f;
if (p.HasCpeExt(CpeExt.ClickDistance)) if (p.Supports(CpeExt.ClickDistance))
p.Send(Packet.ClickDistance(reachDist)); p.Send(Packet.ClickDistance(reachDist));
} }

4
MCGalaxy/CorePlugin/MiscHandlers.cs
View File

@ -50,9 +50,9 @@ namespace MCGalaxy.Core {
p.isFlying = false; p.isFlying = false;
} }
if (p.HasCpeExt(CpeExt.EnvWeatherType)) if (p.Supports(CpeExt.EnvWeatherType))
p.Send(Packet.EnvWeatherType((byte)level.Config.Weather)); p.Send(Packet.EnvWeatherType((byte)level.Config.Weather));
if (p.HasCpeExt(CpeExt.EnvColors)) if (p.Supports(CpeExt.EnvColors))
p.SendCurrentEnvColors(); p.SendCurrentEnvColors();
p.SendCurrentMapAppearance(); p.SendCurrentMapAppearance();
p.SendCurrentBlockPermissions(); p.SendCurrentBlockPermissions();

11
MCGalaxy/Entity/Entities.cs
View File

@ -139,8 +139,11 @@ namespace MCGalaxy {
if (id == Entities.SelfID) pos.Y -= 22; if (id == Entities.SelfID) pos.Y -= 22;
name = Colors.Cleanup(name, dst.hasTextColors); name = Colors.Cleanup(name, dst.hasTextColors);
if (dst.hasExtList) { if (dst.Supports(CpeExt.ExtPlayerList, 2)) {
dst.Send(Packet.ExtAddEntity2(id, skin, name, pos, rot, dst.hasCP437, dst.hasExtPositions)); dst.Send(Packet.ExtAddEntity2(id, skin, name, pos, rot, dst.hasCP437, dst.hasExtPositions));
} else if (dst.hasExtList) {
dst.Send(Packet.ExtAddEntity(id, skin, name, dst.hasCP437));
dst.Send(Packet.Teleport(id, pos, rot, dst.hasExtPositions));
} else { } else {
dst.Send(Packet.AddEntity(id, name, pos, rot, dst.hasCP437, dst.hasExtPositions)); dst.Send(Packet.AddEntity(id, name, pos, rot, dst.hasCP437, dst.hasExtPositions));
} }
@ -149,7 +152,7 @@ namespace MCGalaxy {
dst.Send(Packet.ChangeModel(id, model, dst.hasCP437)); dst.Send(Packet.ChangeModel(id, model, dst.hasCP437));
} }
if (dst.HasCpeExt(CpeExt.EntityProperty)) { if (dst.Supports(CpeExt.EntityProperty)) {
dst.Send(Packet.EntityProperty(id, EntityProp.RotX, Orientation.PackedToDegrees(rot.RotX))); dst.Send(Packet.EntityProperty(id, EntityProp.RotX, Orientation.PackedToDegrees(rot.RotX)));
dst.Send(Packet.EntityProperty(id, EntityProp.RotZ, Orientation.PackedToDegrees(rot.RotZ))); dst.Send(Packet.EntityProperty(id, EntityProp.RotZ, Orientation.PackedToDegrees(rot.RotZ)));
} }
@ -186,7 +189,7 @@ namespace MCGalaxy {
entity.ModelBB = AABB.ModelAABB(model, lvl); entity.ModelBB = AABB.ModelAABB(model, lvl);
foreach (Player pl in players) { foreach (Player pl in players) {
if (pl.level != lvl || !pl.HasCpeExt(CpeExt.ChangeModel)) continue; if (pl.level != lvl || !pl.Supports(CpeExt.ChangeModel)) continue;
if (!pl.CanSeeEntity(entity)) continue; if (!pl.CanSeeEntity(entity)) continue;
byte id = (pl == entity) ? Entities.SelfID : entity.EntityID; byte id = (pl == entity) ? Entities.SelfID : entity.EntityID;
@ -217,7 +220,7 @@ namespace MCGalaxy {
if (prop == EntityProp.RotY) entity.SetYawPitch(rot.RotY, rot.HeadX); if (prop == EntityProp.RotY) entity.SetYawPitch(rot.RotY, rot.HeadX);
foreach (Player pl in players) { foreach (Player pl in players) {
if (pl.level != lvl || !pl.HasCpeExt(CpeExt.EntityProperty)) continue; if (pl.level != lvl || !pl.Supports(CpeExt.EntityProperty)) continue;
if (!pl.CanSeeEntity(entity)) continue; if (!pl.CanSeeEntity(entity)) continue;
byte id = (pl == entity) ? Entities.SelfID : entity.EntityID; byte id = (pl == entity) ? Entities.SelfID : entity.EntityID;

6
MCGalaxy/Games/LevelPicker.cs
View File

@ -99,14 +99,14 @@ namespace MCGalaxy.Games {
// Show message for non-CPE clients // Show message for non-CPE clients
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) { foreach (Player pl in players) {
if (pl.level != game.Map || pl.HasCpeExt(CpeExt.MessageTypes)) continue; if (pl.level != game.Map || pl.Supports(CpeExt.MessageTypes)) continue;
pl.SendMessage("You have 20 seconds to vote for the next map"); pl.SendMessage("You have 20 seconds to vote for the next map");
} }
for (int i = 0; i < 20; i++) { for (int i = 0; i < 20; i++) {
players = PlayerInfo.Online.Items; players = PlayerInfo.Online.Items;
foreach (Player pl in players) { foreach (Player pl in players) {
if (pl.level != game.Map || !pl.HasCpeExt(CpeExt.MessageTypes)) continue; if (pl.level != game.Map || !pl.Supports(CpeExt.MessageTypes)) continue;
pl.SendCpeMessage(CpeMessageType.BottomRight1, "&e" + (20 - i) + "s %Sleft to vote"); pl.SendCpeMessage(CpeMessageType.BottomRight1, "&e" + (20 - i) + "s %Sleft to vote");
} }
Thread.Sleep(1000); Thread.Sleep(1000);
@ -150,7 +150,7 @@ namespace MCGalaxy.Games {
const string line1 = "&eLevel vote - type &a1&e, &b2&e or &c3"; const string line1 = "&eLevel vote - type &a1&e, &b2&e or &c3";
string line2 = "&a" + Candidate1 + "&e, &b" + Candidate2 + "&e, &c" + Candidate3; string line2 = "&a" + Candidate1 + "&e, &b" + Candidate2 + "&e, &c" + Candidate3;
if (p.HasCpeExt(CpeExt.MessageTypes)) { if (p.Supports(CpeExt.MessageTypes)) {
p.SendCpeMessage(CpeMessageType.BottomRight3, line1); p.SendCpeMessage(CpeMessageType.BottomRight3, line1);
p.SendCpeMessage(CpeMessageType.BottomRight2, line2); p.SendCpeMessage(CpeMessageType.BottomRight2, line2);
} else { } else {

4
MCGalaxy/Games/ZombieSurvival/ZSPlugin.cs
View File

@ -114,14 +114,14 @@ namespace MCGalaxy.Games.ZS {
Command.all.FindByName("Spawn").Use(p, ""); Command.all.FindByName("Spawn").Use(p, "");
p.Game.Referee = false; p.Game.Referee = false;
if (p.HasCpeExt(CpeExt.HackControl)) if (p.Supports(CpeExt.HackControl))
p.Send(Hacks.MakeHackControl(p)); p.Send(Hacks.MakeHackControl(p));
} else { } else {
HandlePlayerDisconnect(p, null); HandlePlayerDisconnect(p, null);
Entities.GlobalDespawn(p, false, true); Entities.GlobalDespawn(p, false, true);
p.Game.Referee = true; p.Game.Referee = true;
if (p.HasCpeExt(CpeExt.HackControl)) if (p.Supports(CpeExt.HackControl))
p.Send(Packet.HackControl(true, true, true, true, true, -1)); p.Send(Packet.HackControl(true, true, true, true, true, -1));
} }

4
MCGalaxy/Games/ZombieSurvival/ZombieGame.Core.cs
View File

@ -234,7 +234,7 @@ namespace MCGalaxy.Games {
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player p in players) { foreach (Player p in players) {
if (p.level != Map) continue; if (p.level != Map) continue;
CpeMessageType type = announce && p.HasCpeExt(CpeExt.MessageTypes) CpeMessageType type = announce && p.Supports(CpeExt.MessageTypes)
? CpeMessageType.Announcement : CpeMessageType.Normal; ? CpeMessageType.Announcement : CpeMessageType.Normal;
p.Send(Packet.Message(message, type, p.hasCP437)); p.Send(Packet.Message(message, type, p.hasCP437));
@ -258,7 +258,7 @@ namespace MCGalaxy.Games {
p.Game.InvisibilityTime = left; p.Game.InvisibilityTime = left;
string msg = "&bInvisibility for &a" + left; string msg = "&bInvisibility for &a" + left;
if (p.HasCpeExt(CpeExt.MessageTypes)) { if (p.Supports(CpeExt.MessageTypes)) {
p.SendCpeMessage(CpeMessageType.BottomRight2, msg); p.SendCpeMessage(CpeMessageType.BottomRight2, msg);
} else { } else {
Player.Message(p, msg); Player.Message(p, msg);

6
MCGalaxy/Levels/LevelEnv.cs
View File

@ -46,7 +46,7 @@ namespace MCGalaxy {
lvl.Config.Weather = weather; lvl.Config.Weather = weather;
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) { foreach (Player pl in players) {
if (pl.level == lvl && pl.HasCpeExt(CpeExt.EnvWeatherType)) if (pl.level == lvl && pl.Supports(CpeExt.EnvWeatherType))
pl.Send(Packet.EnvWeatherType(weather)); pl.Send(Packet.EnvWeatherType(weather));
} }
} }
@ -166,7 +166,7 @@ namespace MCGalaxy {
foreach (Player pl in players) { foreach (Player pl in players) {
if (pl.level != lvl) continue; if (pl.level != lvl) continue;
if (pl.HasCpeExt(CpeExt.EnvMapAspect)) { if (pl.Supports(CpeExt.EnvMapAspect)) {
pl.Send(Packet.EnvMapProperty(prop, value)); pl.Send(Packet.EnvMapProperty(prop, value));
} else { } else {
pl.SendCurrentMapAppearance(); pl.SendCurrentMapAppearance();
@ -177,7 +177,7 @@ namespace MCGalaxy {
internal static void UpdateEnvColor(Player p, byte type, string hex) { internal static void UpdateEnvColor(Player p, byte type, string hex) {
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) { foreach (Player pl in players) {
if (pl.level != p.level || !pl.HasCpeExt(CpeExt.EnvColors)) continue; if (pl.level != p.level || !pl.Supports(CpeExt.EnvColors)) continue;
pl.SendEnvColor(type, hex); pl.SendEnvColor(type, hex);
} }
} }

8
MCGalaxy/Network/Player.Networking.cs
View File

@ -128,7 +128,7 @@ namespace MCGalaxy {
retryTag: try { retryTag: try {
foreach (string raw in LineWrapper.Wordwrap(message)) { foreach (string raw in LineWrapper.Wordwrap(message)) {
string line = raw; string line = raw;
if (!HasCpeExt(CpeExt.EmoteFix) && LineEndsInEmote(line)) if (!Supports(CpeExt.EmoteFix) && LineEndsInEmote(line))
line += '\''; line += '\'';
Send(Packet.Message(line, (CpeMessageType)id, hasCP437)); Send(Packet.Message(line, (CpeMessageType)id, hasCP437));
@ -150,7 +150,7 @@ namespace MCGalaxy {
} }
public void SendCpeMessage(CpeMessageType type, string message, bool colorParse = true) { public void SendCpeMessage(CpeMessageType type, string message, bool colorParse = true) {
if (type != CpeMessageType.Normal && !HasCpeExt(CpeExt.MessageTypes)) { if (type != CpeMessageType.Normal && !Supports(CpeExt.MessageTypes)) {
if (type == CpeMessageType.Announcement) type = CpeMessageType.Normal; if (type == CpeMessageType.Announcement) type = CpeMessageType.Normal;
else return; else return;
} }
@ -166,7 +166,7 @@ namespace MCGalaxy {
OnSendingMotdEvent.Call(this, packet); OnSendingMotdEvent.Call(this, packet);
Send(packet); Send(packet);
if (!HasCpeExt(CpeExt.HackControl)) return; if (!Supports(CpeExt.HackControl)) return;
Send(Hacks.MakeHackControl(this)); Send(Hacks.MakeHackControl(this));
if (Game.Referee) if (Game.Referee)
Send(Packet.HackControl(true, true, true, true, true, -1)); Send(Packet.HackControl(true, true, true, true, true, -1));
@ -200,7 +200,7 @@ namespace MCGalaxy {
} }
BlockDefinition.SendLevelCustomBlocks(this); BlockDefinition.SendLevelCustomBlocks(this);
if (HasCpeExt(CpeExt.InventoryOrder)) { if (Supports(CpeExt.InventoryOrder)) {
BlockDefinition.SendLevelInventoryOrder(this); BlockDefinition.SendLevelInventoryOrder(this);
} }
} }

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

@ -92,7 +92,7 @@ namespace MCGalaxy {
} }
/// <summary> Returns whether this player's client supports the given CPE extension. </summary> /// <summary> Returns whether this player's client supports the given CPE extension. </summary>
public bool HasCpeExt(string extName, int version = 1) { public bool Supports(string extName, int version = 1) {
if (!hasCpe) return false; if (!hasCpe) return false;
ExtEntry ext = FindExtension(extName); ExtEntry ext = FindExtension(extName);
return ext != null && ext.ClientExtVersion == version; return ext != null && ext.ClientExtVersion == version;
@ -104,7 +104,7 @@ namespace MCGalaxy {
if (!hasBlockDefs) side = level.RawFallback(side); if (!hasBlockDefs) side = level.RawFallback(side);
if (!hasBlockDefs) edge = level.RawFallback(edge); if (!hasBlockDefs) edge = level.RawFallback(edge);
if (HasCpeExt(CpeExt.EnvMapAspect)) { if (Supports(CpeExt.EnvMapAspect)) {
string url = GetTextureUrl(); string url = GetTextureUrl();
// reset all other textures back to client default. // reset all other textures back to client default.
if (url != lastUrl) Send(Packet.EnvMapUrl("", hasCP437)); if (url != lastUrl) Send(Packet.EnvMapUrl("", hasCP437));
@ -121,7 +121,7 @@ namespace MCGalaxy {
Send(Packet.EnvMapProperty(EnvProp.CloudsSpeed, level.Config.CloudsSpeed)); Send(Packet.EnvMapProperty(EnvProp.CloudsSpeed, level.Config.CloudsSpeed));
Send(Packet.EnvMapProperty(EnvProp.WeatherSpeed, level.Config.WeatherSpeed)); Send(Packet.EnvMapProperty(EnvProp.WeatherSpeed, level.Config.WeatherSpeed));
Send(Packet.EnvMapProperty(EnvProp.ExpFog, level.Config.ExpFog ? 1 : 0)); Send(Packet.EnvMapProperty(EnvProp.ExpFog, level.Config.ExpFog ? 1 : 0));
} else if (HasCpeExt(CpeExt.EnvMapAppearance, 2)) { } else if (Supports(CpeExt.EnvMapAppearance, 2)) {
string url = GetTextureUrl(); string url = GetTextureUrl();
// reset all other textures back to client default. // reset all other textures back to client default.
if (url != lastUrl) { if (url != lastUrl) {
@ -131,7 +131,7 @@ namespace MCGalaxy {
Send(Packet.MapAppearanceV2(url, side, edge, level.Config.EdgeLevel, Send(Packet.MapAppearanceV2(url, side, edge, level.Config.EdgeLevel,
level.Config.CloudsHeight, level.Config.MaxFogDistance, hasCP437)); level.Config.CloudsHeight, level.Config.MaxFogDistance, hasCP437));
lastUrl = url; lastUrl = url;
} else if (HasCpeExt(CpeExt.EnvMapAppearance)) { } else if (Supports(CpeExt.EnvMapAppearance)) {
string url = level.Config.Terrain.Length == 0 ? ServerConfig.DefaultTerrain : level.Config.Terrain; string url = level.Config.Terrain.Length == 0 ? ServerConfig.DefaultTerrain : level.Config.Terrain;
Send(Packet.MapAppearance(url, side, edge, level.Config.EdgeLevel, hasCP437)); Send(Packet.MapAppearance(url, side, edge, level.Config.EdgeLevel, hasCP437));
} }
@ -166,7 +166,7 @@ namespace MCGalaxy {
} }
public void SendCurrentBlockPermissions() { public void SendCurrentBlockPermissions() {
if (!HasCpeExt(CpeExt.BlockPermissions)) return; if (!Supports(CpeExt.BlockPermissions)) return;
// Write the block permissions as one bulk TCP packet // Write the block permissions as one bulk TCP packet
int count = NumBlockPermissions(); int count = NumBlockPermissions();

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

@ -303,7 +303,7 @@ namespace MCGalaxy {
void HandleMovement(byte[] buffer, int offset) { void HandleMovement(byte[] buffer, int offset) {
if (!loggedIn || trainGrab || following.Length > 0) { CheckBlocks(Pos); return; } if (!loggedIn || trainGrab || following.Length > 0) { CheckBlocks(Pos); return; }
if (HasCpeExt(CpeExt.HeldBlock)) { if (Supports(CpeExt.HeldBlock)) {
RawHeldBlock = ExtBlock.FromRaw(buffer[offset + 1]); RawHeldBlock = ExtBlock.FromRaw(buffer[offset + 1]);
} }
@ -490,7 +490,7 @@ namespace MCGalaxy {
return true; return true;
} }
if (HasCpeExt(CpeExt.LongerMessages) && continued != 0) { if (Supports(CpeExt.LongerMessages) && continued != 0) {
partialMessage += text; partialMessage += text;
if (text.Length < NetUtils.StringSize) partialMessage += " "; if (text.Length < NetUtils.StringSize) partialMessage += " ";
return true; return true;