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

Remove any sort of Raptor interconnection -- should have been in some sort of separate plugin anyhow

Browse source
This commit is contained in:
MarioE 2014-06-25 01:22:22 -04:00
parent eb246e9531
commit 5e74037a3a
7 changed files with 1 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

26
TShockAPI/Commands.cs
View file

@ -2083,11 +2083,6 @@ namespace TShockAPI
else if (TShock.Warps.Add(args.Player.TileX, args.Player.TileY, warpName))
{
args.Player.SendSuccessMessage("Warp added: " + warpName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp))
tsplr.SendRaptorWarp(TShock.Warps.Find(warpName));
}
}
else
{
@ -2107,11 +2102,6 @@ namespace TShockAPI
if (TShock.Warps.Remove(warpName))
{
args.Player.SendSuccessMessage("Warp deleted: " + warpName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp))
tsplr.SendRaptorWarpDeletion(warpName);
}
}
else
args.Player.SendErrorMessage("Could not find the specified warp.");
@ -3297,12 +3287,6 @@ namespace TShockAPI
args.Player.TempPoints[0] = Point.Zero;
args.Player.TempPoints[1] = Point.Zero;
args.Player.SendMessage("Set region " + regionName, Color.Yellow);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion))
tsplr.SendRaptorRegion(TShock.Regions.GetRegionByName(regionName));
}
}
else
{
@ -3352,11 +3336,6 @@ namespace TShockAPI
if (TShock.Regions.DeleteRegion(regionName))
{
args.Player.SendInfoMessage("Deleted region \"{0}\".", regionName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion))
tsplr.SendRaptorRegionDeletion(regionName);
}
}
else
args.Player.SendErrorMessage("Could not find the specified region!");
@ -3708,11 +3687,6 @@ namespace TShockAPI
if (TShock.Regions.resizeRegion(args.Parameters[1], addAmount, direction))
{
args.Player.SendMessage("Region Resized Successfully!", Color.Yellow);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion))
tsplr.SendRaptorRegion(TShock.Regions.GetRegionByName(args.Parameters[1]));
}
TShock.Regions.Reload();
}
else

121
TShockAPI/GetDataHandlers.cs
View file

@ -1243,7 +1243,6 @@ namespace TShockAPI
{ PacketTypes.Teleport, HandleTeleport },
{ PacketTypes.PaintTile, HandlePaintTile },
{ PacketTypes.PaintWall, HandlePaintWall },
{ PacketTypes.Placeholder, HandleRaptor },
{ PacketTypes.DoorUse, HandleDoorUse },
{ PacketTypes.CompleteAnglerQuest, HandleCompleteAnglerQuest },
{ PacketTypes.NumberOfAnglerQuestsCompleted, HandleNumberOfAnglerQuestsCompleted }
@ -3479,126 +3478,6 @@ namespace TShockAPI
return false;
}
private static bool HandleRaptor(GetDataHandlerArgs args)
{
var type = (RaptorPacketTypes)args.Data.ReadInt8();
switch (type)
{
case RaptorPacketTypes.Acknowledge:
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;
case RaptorPacketTypes.Region:
if (args.Player.Group.HasPermission(Permissions.manageregion))
{
int x = args.Data.ReadInt32();
int y = args.Data.ReadInt32();
int width = args.Data.ReadInt32();
int height = args.Data.ReadInt32();
string regionName = args.Data.ReadString();
Region region;
if ((region = TShock.Regions.GetRegionByName(regionName)) == null)
{
TShock.Regions.AddRegion(x, y, width, height, regionName, args.Player.UserAccountName, Main.worldID.ToString());
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion) && tsplr != args.Player)
tsplr.SendRaptorRegion(TShock.Regions.GetRegionByName(regionName));
}
Log.Info("{0} added region \"{1}\".", args.Player.UserAccountName, regionName);
}
else
{
TShock.Regions.PositionRegion(regionName, x, y, width, height);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion) && tsplr != args.Player)
tsplr.SendRaptorRegion(region);
}
Log.Info("{0} moved region \"{1}\".", args.Player.UserAccountName, regionName);
}
}
return true;
case RaptorPacketTypes.RegionDelete:
if (args.Player.Group.HasPermission(Permissions.manageregion))
{
string regionName = args.Data.ReadString();
TShock.Regions.DeleteRegion(regionName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion) && tsplr != args.Player)
tsplr.SendRaptorRegionDeletion(regionName);
}
Log.Info("{0} deleted region \"{1}\".", args.Player.UserAccountName, regionName);
}
return true;
case RaptorPacketTypes.Warp:
if (args.Player.Group.HasPermission(Permissions.managewarp))
{
int x = args.Data.ReadInt32();
int y = args.Data.ReadInt32();
string warpName = args.Data.ReadString();
Warp warp = TShock.Warps.Find(warpName);
if (warp == null)
{
TShock.Warps.Add(x, y, warpName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)
tsplr.SendRaptorWarp(TShock.Warps.Find(warpName));
}
Log.Info("{0} added warp \"{1}\".", args.Player.UserAccountName, warpName);
}
else
{
TShock.Warps.Position(warpName, x, y);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)
tsplr.SendRaptorWarp(warp);
}
Log.Info("{0} moved warp \"{1}\".", args.Player.UserAccountName, warpName);
}
}
return true;
case RaptorPacketTypes.WarpDelete:
if (args.Player.Group.HasPermission(Permissions.managewarp))
{
string warpName = args.Data.ReadString();
TShock.Warps.Remove(warpName);
foreach (TSPlayer tsplr in TShock.Players)
{
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)
tsplr.SendRaptorWarpDeletion(warpName);
}
Log.Info("{0} deleted warp \"{1}\".", args.Player.UserAccountName, warpName);
}
return true;
default:
return true;
}
}
private static bool HandleDoorUse(GetDataHandlerArgs args)
{
var close = args.Data.ReadByte();

17
TShockAPI/Group.cs
View file

@ -235,12 +235,6 @@ namespace TShockAPI
negatedpermissions.Add(permission);
permissions.Remove(permission); // Ensure we don't have conflicting definitions for a permissions
}
for (int i = 0; i < TShock.Players.Length; i++)
{
if (TShock.Players[i] != null && TShock.Players[i].IsRaptor)
TShock.Players[i].SendRaptorPermissions();
}
}
/// <summary>
@ -260,12 +254,6 @@ namespace TShockAPI
permissions.Add(permission);
negatedpermissions.Remove(permission); // Ensure we don't have conflicting definitions for a permissions
}
for (int i = 0; i < TShock.Players.Length; i++)
{
if (TShock.Players[i] != null && TShock.Players[i].IsRaptor)
TShock.Players[i].SendRaptorPermissions();
}
}
/// <summary>
@ -293,11 +281,6 @@ namespace TShockAPI
return;
}
permissions.Remove(permission);
for (int i = 0; i < TShock.Players.Length; i++)
{
if (TShock.Players[i] != null && TShock.Players[i].IsRaptor && TShock.Players[i].Group == this)
TShock.Players[i].SendRaptorPermissions();
}
}
/// <summary>

38
TShockAPI/RaptorPacketTypes.cs
View file

@ -1,38 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace TShockAPI
{
/// <summary>
/// Custom packet types for use with Raptor.
/// </summary>
public enum RaptorPacketTypes : byte
{
/// <summary>
/// The packet sent to the server to be acknowledged as a Raptor client.
/// </summary>
Acknowledge = 0,
/// <summary>
/// The packet sent to the client which dictates its permissions.
/// </summary>
Permissions,
/// <summary>
/// The packet sent which sets region info.
/// </summary>
Region,
/// <summary>
/// The packet sent to delete a region.
/// </summary>
RegionDelete,
/// <summary>
/// The packet sent which sets warp info.
/// </summary>
Warp,
/// <summary>
/// The packet sent to delete a warp.
/// </summary>
WarpDelete
}
}

176
TShockAPI/TSPlayer.cs
View file

@ -40,11 +40,6 @@ namespace TShockAPI
/// </summary>
public static readonly TSPlayer All = new TSPlayer("All");
/// <summary>
/// Gets whether the player is using Raptor.
/// </summary>
public bool IsRaptor { get; internal set; }
/// <summary>
/// The amount of tiles that the player has killed in the last second.
/// </summary>
@ -904,177 +899,6 @@ namespace TShockAPI
NetMessage.SendBytes(Netplay.serverSock[Index], data, 0, data.Length, Netplay.serverSock[Index].ServerWriteCallBack, Netplay.serverSock[Index].networkStream);
}
/// <summary>
/// Sends Raptor permissions to the player.
/// </summary>
public void SendRaptorPermissions()
{
if (!IsRaptor)
return;
lock (NetMessage.buffer[Index].writeBuffer)
{
int length = 0;
using (var ms = new MemoryStream(NetMessage.buffer[Index].writeBuffer, true))
{
using (var writer = new BinaryWriter(ms))
{
writer.BaseStream.Position = 4;
writer.Write((byte)PacketTypes.Placeholder);
writer.Write((byte)RaptorPacketTypes.Permissions);
writer.Write(String.Join(",", Group.TotalPermissions.ToArray()));
length = (int)writer.BaseStream.Position;
writer.BaseStream.Position = 0;
writer.Write(length - 4);
}
}
TShock.PacketBuffer.SendBytes(Netplay.serverSock[Index], NetMessage.buffer[Index].writeBuffer, 0, length);
}
}
/// <summary>
/// Sends a region to the player.
/// <param name="region">The region.</param>
/// </summary>
public void SendRaptorRegion(Region region)
{
if (!IsRaptor)
return;
lock (NetMessage.buffer[Index].writeBuffer)
{
int length = 0;
using (var ms = new MemoryStream(NetMessage.buffer[Index].writeBuffer, true))
{
using (var writer = new BinaryWriter(ms))
{
writer.BaseStream.Position = 4;
writer.Write((byte)PacketTypes.Placeholder);
writer.Write((byte)RaptorPacketTypes.Region);
writer.Write(region.Area.X);
writer.Write(region.Area.Y);
writer.Write(region.Area.Width);
writer.Write(region.Area.Height);
writer.Write(region.Name);
length = (int)writer.BaseStream.Position;
writer.BaseStream.Position = 0;
writer.Write(length - 4);
}
}
TShock.PacketBuffer.SendBytes(Netplay.serverSock[Index], NetMessage.buffer[Index].writeBuffer, 0, length);
}
}
/// <summary>
/// Sends a region deletion to the player.
/// <param name="regionName">The region name.</param>
/// </summary>
public void SendRaptorRegionDeletion(string regionName)
{
if (!IsRaptor)
return;
lock (NetMessage.buffer[Index].writeBuffer)
{
int length = 0;
using (var ms = new MemoryStream(NetMessage.buffer[Index].writeBuffer, true))
{
using (var writer = new BinaryWriter(ms))
{
writer.BaseStream.Position = 4;
writer.Write((byte)PacketTypes.Placeholder);
writer.Write((byte)RaptorPacketTypes.RegionDelete);
writer.Write(regionName);
length = (int)writer.BaseStream.Position;
writer.BaseStream.Position = 0;
writer.Write(length - 4);
}
}
TShock.PacketBuffer.SendBytes(Netplay.serverSock[Index], NetMessage.buffer[Index].writeBuffer, 0, length);
}
}
/// <summary>
/// Sends a warp to the player.
/// <param name="warp">The warp.</param>
/// </summary>
public void SendRaptorWarp(Warp warp)
{
if (!IsRaptor)
return;
lock (NetMessage.buffer[Index].writeBuffer)
{
int length = 0;
using (var ms = new MemoryStream(NetMessage.buffer[Index].writeBuffer, true))
{
using (var writer = new BinaryWriter(ms))
{
writer.BaseStream.Position = 4;
writer.Write((byte)PacketTypes.Placeholder);
writer.Write((byte)RaptorPacketTypes.Warp);
writer.Write(warp.Position.X);
writer.Write(warp.Position.Y);
writer.Write(warp.Name);
length = (int)writer.BaseStream.Position;
writer.BaseStream.Position = 0;
writer.Write(length - 4);
}
}
TShock.PacketBuffer.SendBytes(Netplay.serverSock[Index], NetMessage.buffer[Index].writeBuffer, 0, length);
}
}
/// <summary>
/// Sends a warp deletion to the player.
/// <param name="warpName">The warp name.</param>
/// </summary>
public void SendRaptorWarpDeletion(string warpName)
{
if (!IsRaptor)
return;
lock (NetMessage.buffer[Index].writeBuffer)
{
int length = 0;
using (var ms = new MemoryStream(NetMessage.buffer[Index].writeBuffer, true))
{
using (var writer = new BinaryWriter(ms))
{
writer.BaseStream.Position = 4;
writer.Write((byte)PacketTypes.Placeholder);
writer.Write((byte)RaptorPacketTypes.WarpDelete);
writer.Write(warpName);
length = (int)writer.BaseStream.Position;
writer.BaseStream.Position = 0;
writer.Write(length - 4);
}
}
TShock.PacketBuffer.SendBytes(Netplay.serverSock[Index], NetMessage.buffer[Index].writeBuffer, 0, length);
}
}
/// <summary>
/// Adds a command callback to a specified command string.
/// </summary>

18
TShockAPI/TShock.cs
View file

@ -349,24 +349,6 @@ namespace TShockAPI
private void OnPlayerLogin(Hooks.PlayerPostLoginEventArgs args)
{
if (args.Player.IsRaptor)
{
Task.Factory.StartNew(() =>
{
args.Player.SendRaptorPermissions();
if (args.Player.Group.HasPermission(Permissions.manageregion))
{
for (int i = 0; i < Regions.Regions.Count; i++)
args.Player.SendRaptorRegion(Regions.Regions[i]);
}
if (args.Player.Group.HasPermission(Permissions.managewarp))
{
for (int i = 0; i < Warps.Warps.Count; i++)
args.Player.SendRaptorWarp(Warps.Warps[i]);
}
});
}
User u = Users.GetUserByName(args.Player.UserAccountName);
List<String> KnownIps = new List<string>();
if (!string.IsNullOrWhiteSpace(u.KnownIps))

3
TShockAPI/TShockAPI.csproj
View file

@ -77,7 +77,6 @@
<Compile Include="Hooks\GeneralHooks.cs" />
<Compile Include="Hooks\PlayerHooks.cs" />
<Compile Include="PaginationTools.cs" />
<Compile Include="RaptorPacketTypes.cs" />
<Compile Include="Rest\RestPermissions.cs" />
<Compile Include="SaveManager.cs" />
<Compile Include="DB\BanManager.cs" />
@ -180,7 +179,7 @@
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
<UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.