From a5dd236de4e777b20ccbfa756b2b1cb39f29b187 Mon Sep 17 00:00:00 2001 From: Enerdy Date: Mon, 6 Jul 2015 23:19:44 +0100 Subject: [PATCH] Fixed some invasion projectiles freezing everyone under certain conditions (Thanks @Patrikkk) --- TShockAPI/GetDataHandlers.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 2f53ddac..83b19505 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2419,15 +2419,15 @@ namespace TShockAPI private static bool HandleProjectileNew(GetDataHandlerArgs args) { - var ident = args.Data.ReadInt16(); + short ident = args.Data.ReadInt16(); var pos = new Vector2(args.Data.ReadSingle(), args.Data.ReadSingle()); var vel = new Vector2(args.Data.ReadSingle(), args.Data.ReadSingle()); - var knockback = args.Data.ReadSingle(); - var dmg = args.Data.ReadInt16(); - var owner = args.Data.ReadInt8(); - var type = args.Data.ReadInt16(); - var bits = (BitsByte) args.Data.ReadInt8(); - owner = (byte)args.Player.Index; + float knockback = args.Data.ReadSingle(); + short dmg = args.Data.ReadInt16(); + byte owner = args.Data.ReadInt8(); + short type = args.Data.ReadInt16(); + BitsByte bits = args.Data.ReadInt8(); + //owner = (byte)args.Player.Index; float[] ai = new float[Projectile.maxAI]; for (int i = 0; i < Projectile.maxAI; i++) @@ -2474,7 +2474,7 @@ namespace TShockAPI bool hasPermission = !TShock.CheckProjectilePermission(args.Player, index, type); if (!TShock.Config.IgnoreProjUpdate && !hasPermission && !args.Player.Group.HasPermission(Permissions.ignoreprojectiledetection)) { - if (type == 100 || type == 164 || type == 180 || type == 261 || (type > 289 && type < 298) || (type >= 325 && type <= 328) || (type >= 345 && type <= 352)) + if (type == 100 || type == 164 || type == 180 || type == 261 || (type > 289 && type < 298) || (type >= 325 && type <= 328) || (type >= 345 && type <= 352) || (type >= 435 && type <= 438)) { TShock.Log.Debug("Certain projectiles have been ignored for cheat detection."); }