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

Fix identing after conflict resolve merge.

Browse source
This commit is contained in:
Patrikkk 2020-06-02 11:41:41 +02:00
parent f01274164f
commit 0619092ba5
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/GetDataHandlers.cs
View file

@ -152,7 +152,7 @@ namespace TShockAPI
{ PacketTypes.PlayerHurtV2, HandlePlayerDamageV2 }, { PacketTypes.PlayerHurtV2, HandlePlayerDamageV2 },
{ PacketTypes.PlayerDeathV2, HandlePlayerKillMeV2 }, { PacketTypes.PlayerDeathV2, HandlePlayerKillMeV2 },
{ PacketTypes.Emoji, HandleEmoji }, { PacketTypes.Emoji, HandleEmoji },
{ PacketTypes.SyncRevengeMarker, HandleSyncRevengeMarker }, { PacketTypes.SyncRevengeMarker, HandleSyncRevengeMarker },
{ PacketTypes.FishOutNPC, HandleFishOutNPC }, { PacketTypes.FishOutNPC, HandleFishOutNPC },
{ PacketTypes.FoodPlatterTryPlacing, HandleFoodPlatterTryPlacing }, { PacketTypes.FoodPlatterTryPlacing, HandleFoodPlatterTryPlacing },
{ PacketTypes.SyncCavernMonsterType, HandleSyncCavernMonsterType } { PacketTypes.SyncCavernMonsterType, HandleSyncCavernMonsterType }
@ -3603,7 +3603,7 @@ namespace TShockAPI
return false; return false;
} }
private static bool HandleSyncRevengeMarker(GetDataHandlerArgs args) private static bool HandleSyncRevengeMarker(GetDataHandlerArgs args)
{ {
int uniqueID = args.Data.ReadInt32(); int uniqueID = args.Data.ReadInt32();
Vector2 location = args.Data.ReadVector2(); Vector2 location = args.Data.ReadVector2();
@ -3615,7 +3615,7 @@ namespace TShockAPI
float baseValue = args.Data.ReadSingle(); float baseValue = args.Data.ReadSingle();
bool spawnedFromStatus = args.Data.ReadBoolean(); bool spawnedFromStatus = args.Data.ReadBoolean();
return false; return false;
} }
private static bool HandleFishOutNPC(GetDataHandlerArgs args) private static bool HandleFishOutNPC(GetDataHandlerArgs args)