themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Change acknowledgement order

Browse source
This commit is contained in:
MarioE 2013-11-03 10:36:27 -05:00
parent 2f9fbad5bc
commit a9ef5d9b6d
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
TShockAPI/GetDataHandlers.cs
View file

@ -24,9 +24,10 @@ using System.IO;
using System.IO.Streams; using System.IO.Streams;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks;
using TShockAPI.DB; using TShockAPI.DB;
using Terraria;
using TShockAPI.Net; using TShockAPI.Net;
using Terraria;
namespace TShockAPI namespace TShockAPI
{ {
@ -3400,6 +3401,24 @@ namespace TShockAPI
{ {
case RaptorPacketTypes.Acknowledge: case RaptorPacketTypes.Acknowledge:
args.Player.IsRaptor = true; args.Player.IsRaptor = true;
// Send these if the player was logged in before this packet arrives
if (args.Player.IsLoggedIn)
{
Task.Factory.StartNew(() =>
{
args.Player.SendRaptorPermissions();
if (args.Player.Group.HasPermission(Permissions.manageregion))
{
for (int i = 0; i < TShock.Regions.Regions.Count; i++)
args.Player.SendRaptorRegion(TShock.Regions.Regions[i]);
}
if (args.Player.Group.HasPermission(Permissions.managewarp))
{
for (int i = 0; i < TShock.Warps.Warps.Count; i++)
args.Player.SendRaptorWarp(TShock.Warps.Warps[i]);
}
});
}
return true; return true;
case RaptorPacketTypes.Region: case RaptorPacketTypes.Region:
if (args.Player.Group.HasPermission(Permissions.manageregion)) if (args.Player.Group.HasPermission(Permissions.manageregion))

13
TShockAPI/TShock.cs
View file

@ -1123,7 +1123,7 @@ namespace TShockAPI
} }
if ((player.State < 10 || player.Dead) && (int) type > 12 && (int) type != 16 && (int) type != 42 && (int) type != 50 && if ((player.State < 10 || player.Dead) && (int) type > 12 && (int) type != 16 && (int) type != 42 && (int) type != 50 &&
(int) type != 38 && (int) type != 21 && (int) type != 67) (int) type != 38 && (int) type != 21)
{ {
e.Handled = true; e.Handled = true;
return; return;
@ -1131,15 +1131,8 @@ namespace TShockAPI
using (var data = new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)) using (var data = new MemoryStream(e.Msg.readBuffer, e.Index, e.Length))
{ {
try // Exceptions are already handled
{ e.Handled = GetDataHandlers.HandlerGetData(type, player, data);
if (GetDataHandlers.HandlerGetData(type, player, data))
e.Handled = true;
}
catch (Exception ex)
{
Log.Error(ex.ToString());
}
} }
} }