aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code formatiert

Browse Source
This commit is contained in:
Lennart Kampshoff
2019-12-21 14:03:06 +01:00
parent c5f72c2ce5
commit ed95acc24d
56 changed files with 1771 additions and 1764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -73,7 +73,8 @@ namespace ReallifeGamemode.Server.Events
if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName)) if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName))
{ {
ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")", AdminLevel.TEAM); ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")", AdminLevel.TEAM);
} else if (user.IsAdmin(AdminLevel.TEAM)) }
else if (user.IsAdmin(AdminLevel.TEAM))
{ {
ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name + " [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM); ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name + " [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM);
} }

9
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -120,7 +120,8 @@ namespace ReallifeGamemode.Server.Gangwar
if (this.Def_Score <= 0) if (this.Def_Score <= 0)
{ {
this.takeOver(this.Attacker); this.takeOver(this.Attacker);
} else if (this.Att_Score <= 0) }
else if (this.Att_Score <= 0)
{ {
this.takeOver(this.Owner); this.takeOver(this.Owner);
} }
@@ -137,7 +138,8 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
} }
}else if(this.Def_Score < this.Att_Score) }
else if (this.Def_Score < this.Att_Score)
{ {
this.takeOver(this.Attacker); this.takeOver(this.Attacker);
this.Def_Score = 0; this.Def_Score = 0;
@@ -178,7 +180,8 @@ namespace ReallifeGamemode.Server.Gangwar
} }
} }
if(playerInside.Find(c => c == client) == null) { if (playerInside.Find(c => c == client) == null)
{
playerInside.Add(client); playerInside.Add(client);
client.SetData("GotInsideOfTurf", true); client.SetData("GotInsideOfTurf", true);
} }

6
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -233,7 +233,8 @@ namespace ReallifeGamemode.Server.Managers
{ {
for (int i = 0; i <= vItem.Amount; i++) for (int i = 0; i <= vItem.Amount; i++)
{ {
if(GetUserInventoryWeight(client) + (iItem.Gewicht * i) > 40000) { if (GetUserInventoryWeight(client) + (iItem.Gewicht * i) > 40000)
{
vItem.Amount = i - 1; vItem.Amount = i - 1;
break; break;
} }
@@ -621,7 +622,8 @@ namespace ReallifeGamemode.Server.Managers
if (fItem.Amount > amount) if (fItem.Amount > amount)
{ {
fItem.Amount -= amount; fItem.Amount -= amount;
}else if(fItem.Amount == amount) }
else if (fItem.Amount == amount)
{ {
context.UserItems.Remove(fItem); context.UserItems.Remove(fItem);
} }

3
ReallifeGamemode.Server/Wanted/Jail.cs
View File

@@ -203,7 +203,8 @@ namespace ReallifeGamemode.Server.Wanted
if (((int)(user.JailTime / 60)) == 0 && user.JailTime != 0) if (((int)(user.JailTime / 60)) == 0 && user.JailTime != 0)
{ {
timeMinutes = 1; timeMinutes = 1;
} else }
else
{ {
timeMinutes = (int)(user.JailTime / 60); timeMinutes = (int)(user.JailTime / 60);
} }