JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned warning.

Browse Source 
Fixed punish command on web side.
This commit is contained in:
Jonathan Williams 2013-09-03 14:10:14 -07:00
parent c2ec238af5
commit 346bdb030e
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java
View File

@ -1,6 +1,5 @@
package nautilus.game.arcade.shop; package nautilus.game.arcade.shop;
import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;

14
Website/LOC.Website.Common/Models/AccountAdministrator.cs
View File

@ -529,16 +529,10 @@
protected Account GetAccountByName(string name, IRepository repository) protected Account GetAccountByName(string name, IRepository repository)
{ {
return repository.Where<Account>(x => x.Name == name) var account = repository.Where<Account>(x => x.Name == name).FirstOrDefault();
.Include(x => x.Rank) account.LoadNavigationProperties(repository.Context);
.Include(x => x.Clan)
.Include(x => x.ClanRole) return account;
.Include(x => x.CustomBuilds)
.Include(x => x.FishCatches)
.Include(x => x.PvpTransactions)
.Include(x => x.Pets)
.Include(x => x.Punishments)
.FirstOrDefault();
} }
protected Account CreateAccount(LoginRequestToken loginToken, IRepository repository) protected Account CreateAccount(LoginRequestToken loginToken, IRepository repository)

8
Website/LOC.Website.Web/LOC.Website.Web.Publish.xml
View File

@ -360,7 +360,7 @@
<file relUrl="Content/themes/techno/images/templatemo_image_02.png" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/themes/techno/images/templatemo_image_02.png" publishTime="11/27/2012 17:05:50" />
<file relUrl="Content/Images/Wiki/Ranger.png" publishTime="04/19/2013 03:35:02" /> <file relUrl="Content/Images/Wiki/Ranger.png" publishTime="04/19/2013 03:35:02" />
<file relUrl="Scripts/jquery-1.8.2.js" publishTime="11/27/2012 17:05:51" /> <file relUrl="Scripts/jquery-1.8.2.js" publishTime="11/27/2012 17:05:51" />
<file relUrl="bin/LOC.Website.Common.pdb" publishTime="09/03/2013 11:31:14" /> <file relUrl="bin/LOC.Website.Common.pdb" publishTime="09/03/2013 13:31:10" />
<file relUrl="bin/LOC.Core.pdb" publishTime="09/02/2013 19:25:31" /> <file relUrl="bin/LOC.Core.pdb" publishTime="09/02/2013 19:25:31" />
<file relUrl="Content/Images/Wiki/red_dye.jpg" publishTime="04/19/2013 03:12:21" /> <file relUrl="Content/Images/Wiki/red_dye.jpg" publishTime="04/19/2013 03:12:21" />
<file relUrl="Scripts/MicrosoftMvcValidation.js" publishTime="11/27/2012 17:05:51" /> <file relUrl="Scripts/MicrosoftMvcValidation.js" publishTime="11/27/2012 17:05:51" />
@ -433,9 +433,9 @@
<file relUrl="Views/Store/_WritePackage.cshtml" publishTime="04/19/2013 17:36:49" /> <file relUrl="Views/Store/_WritePackage.cshtml" publishTime="04/19/2013 17:36:49" />
<file relUrl="Content/css/bootstrap-responsive.min.css" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/css/bootstrap-responsive.min.css" publishTime="11/27/2012 17:05:50" />
<file relUrl="Views/Servers/Index.cshtml" publishTime="05/08/2013 10:15:36" /> <file relUrl="Views/Servers/Index.cshtml" publishTime="05/08/2013 10:15:36" />
<file relUrl="bin/LOC.Website.Web.dll" publishTime="09/03/2013 11:31:15" /> <file relUrl="bin/LOC.Website.Web.dll" publishTime="09/03/2013 13:31:12" />
<file relUrl="Views/Shared/_FrontLayout.cshtml" publishTime="11/27/2012 17:05:51" /> <file relUrl="Views/Shared/_FrontLayout.cshtml" publishTime="11/27/2012 17:05:51" />
<file relUrl="bin/LOC.Website.Web.pdb" publishTime="09/03/2013 11:31:15" /> <file relUrl="bin/LOC.Website.Web.pdb" publishTime="09/03/2013 13:31:12" />
<file relUrl="Content/themes/base/images/ui-bg_glass_65_ffffff_1x400.png" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/themes/base/images/ui-bg_glass_65_ffffff_1x400.png" publishTime="11/27/2012 17:05:50" />
<file relUrl="Views/Profile/Index.cshtml" publishTime="11/27/2012 17:05:51" /> <file relUrl="Views/Profile/Index.cshtml" publishTime="11/27/2012 17:05:51" />
<file relUrl="bin/WebMatrix.WebData.xml" publishTime="11/27/2012 17:05:51" /> <file relUrl="bin/WebMatrix.WebData.xml" publishTime="11/27/2012 17:05:51" />
@ -483,7 +483,7 @@
<file relUrl="Content/themes/techno/images/templatemo_home_header.jpg" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/themes/techno/images/templatemo_home_header.jpg" publishTime="11/27/2012 17:05:50" />
<file relUrl="Content/themes/techno/images/blog/03.jpg" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/themes/techno/images/blog/03.jpg" publishTime="11/27/2012 17:05:50" />
<file relUrl="Content/themes/techno/images/slider/ss.png" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/themes/techno/images/slider/ss.png" publishTime="11/27/2012 17:05:50" />
<file relUrl="bin/LOC.Website.Common.dll" publishTime="09/03/2013 11:31:14" /> <file relUrl="bin/LOC.Website.Common.dll" publishTime="09/03/2013 13:31:11" />
<file relUrl="Content/themes/techno/images/prevlabel.gif" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/themes/techno/images/prevlabel.gif" publishTime="11/27/2012 17:05:50" />
<file relUrl="Content/themes/techno/images/templatemo_subpage_bg.jpg" publishTime="11/27/2012 17:05:50" /> <file relUrl="Content/themes/techno/images/templatemo_subpage_bg.jpg" publishTime="11/27/2012 17:05:50" />
<file relUrl="bin/LOC.Core.dll" publishTime="09/02/2013 19:25:31" /> <file relUrl="bin/LOC.Core.dll" publishTime="09/02/2013 19:25:31" />