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

Fix previous conflict resolve merging.

Browse source
This commit is contained in:
Patrikkk 2020-06-02 19:10:34 +02:00
parent 60840807cf
commit cffdadbc80
1 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

43
TShockAPI/GetDataHandlers.cs
View file

@ -3696,35 +3696,6 @@ namespace TShockAPI
return false; return false;
} }
private static bool HandleSyncRevengeMarker(GetDataHandlerArgs args)
{
int uniqueID = args.Data.ReadInt32();
Vector2 location = args.Data.ReadVector2();
int netId = args.Data.ReadInt32();
float npcHpPercent = args.Data.ReadSingle();
int npcTypeAgainstDiscouragement = args.Data.ReadInt32(); //tfw the argument is Type Against Discouragement
int npcAiStyleAgainstDiscouragement = args.Data.ReadInt32(); //see ^
int coinsValue = args.Data.ReadInt32();
float baseValue = args.Data.ReadSingle();
bool spawnedFromStatus = args.Data.ReadBoolean();
return false;
}
private static bool HandleLandGolfBallInCup(GetDataHandlerArgs args)
{
byte playerIndex = args.Data.ReadInt8();
ushort tileX = args.Data.ReadUInt16();
ushort tileY = args.Data.ReadUInt16();
ushort hits = args.Data.ReadUInt16();
ushort projectileType = args.Data.ReadUInt16();
if (OnLandGolfBallInCup(args.Player, args.Data, playerIndex, tileX, tileY, hits, projectileType))
return true;
return false;
}
private static bool HandleSyncTilePicking(GetDataHandlerArgs args) private static bool HandleSyncTilePicking(GetDataHandlerArgs args)
{ {
@ -3750,6 +3721,20 @@ namespace TShockAPI
int coinsValue = args.Data.ReadInt32(); int coinsValue = args.Data.ReadInt32();
float baseValue = args.Data.ReadSingle(); float baseValue = args.Data.ReadSingle();
bool spawnedFromStatus = args.Data.ReadBoolean(); bool spawnedFromStatus = args.Data.ReadBoolean();
return false;
}
private static bool HandleLandGolfBallInCup(GetDataHandlerArgs args)
{
byte playerIndex = args.Data.ReadInt8();
ushort tileX = args.Data.ReadUInt16();
ushort tileY = args.Data.ReadUInt16();
ushort hits = args.Data.ReadUInt16();
ushort projectileType = args.Data.ReadUInt16();
if (OnLandGolfBallInCup(args.Player, args.Data, playerIndex, tileX, tileY, hits, projectileType))
return true;
return false; return false;
} }