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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2011-12-11 10:59:15 -07:00
commit 83013f66d4
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TShockAPI/Commands.cs
View file

@ -1678,7 +1678,8 @@ namespace TShockAPI
{ {
FileTools.SetupConfig(); FileTools.SetupConfig();
TShock.Groups.LoadPermisions(); TShock.Groups.LoadPermisions();
args.Player.SendMessage("Configuration & Permissions reload complete. Some changes may require server restart."); TShock.Regions.ReloadAllRegions();
args.Player.SendMessage("Configuration, Permissions, and Regions reload complete. Some changes may require server restart.");
} }
private static void ServerPassword(CommandArgs args) private static void ServerPassword(CommandArgs args)

6
TShockAPI/GetDataHandlers.cs
View file

@ -117,6 +117,7 @@ namespace TShockAPI
{PacketTypes.PlayerSlot, HandlePlayerSlot}, {PacketTypes.PlayerSlot, HandlePlayerSlot},
{PacketTypes.TileGetSection, HandleGetSection}, {PacketTypes.TileGetSection, HandleGetSection},
{PacketTypes.UpdateNPCHome, UpdateNPCHome }, {PacketTypes.UpdateNPCHome, UpdateNPCHome },
{PacketTypes.PlayerAddBuff, HandlePlayerBuff},
}; };
} }
@ -798,5 +799,10 @@ namespace TShockAPI
} }
return false; return false;
} }
private static bool HandlePlayerBuff(GetDataHandlerArgs args)
{
return !args.Player.Group.HasPermission(Permissions.ignoregriefdetection);
}
} }
} }