Merge branch 'general-devel' into fix-invalid-groups
This commit is contained in:
commit
91376ae087
23 changed files with 128 additions and 81 deletions
|
|
@ -464,14 +464,14 @@ namespace TShockAPI.DB
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
TShock.Log.Error($"An exception has occured during database transaction: {ex.Message}");
|
||||
TShock.Log.Error($"An exception has occurred during database transaction: {ex.Message}");
|
||||
try
|
||||
{
|
||||
transaction.Rollback();
|
||||
}
|
||||
catch (Exception rollbackEx)
|
||||
{
|
||||
TShock.Log.Error($"An exception has occured during database rollback: {rollbackEx.Message}");
|
||||
TShock.Log.Error($"An exception has occurred during database rollback: {rollbackEx.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue