Merge pull request #15 from Renerte/develop

Fixes
Renerte · Jan 26, 2017 · fc36250 · fc36250
2 parents de58e38 + 209bdb6
commit fc36250
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/CitieZ/CitieZ.cs b/CitieZ/CitieZ.cs
@@ -54,7 +54,7 @@ public override void Initialize()
 
         private void OnPlayerCommand(PlayerCommandEventArgs e)
         {
-            if (e.Handled || (e.Player == null))
+            if (e.Handled || e.Player == null)
                 return;
         }
 
@@ -73,9 +73,7 @@ await Cities.DiscoverAsync(city.Name, e.Player))
                 }
                 var discovery = await Cities.GetDiscoveryAsync(city.Name);
                 if (discovery == null)
-                {
                     return;
-                }
                 e.Player.SendInfoMessage(string.Format(Config.WelcomeMessage, city.Name, discovery.PlayerName));
             }
         }
@@ -151,12 +149,12 @@ private void OnGameInitialize(EventArgs e)
                 TShockAPI.Commands.ChatCommands.Add(c);
             };
 
-            Add(new Command(Commands.City, "city")
+            Add(new Command("citiez.tp", Commands.City, "city")
             {
                 HelpText = "Teleports to city, if player has discovered it"
             });
 
-            Add(new Command(Commands.Manage, "citiez")
+            Add(new Command("citiez.manage", Commands.Manage, "citiez")
             {
                 HelpText = "Manages cities"
             });

diff --git a/CitieZ/CitieZ.csproj b/CitieZ/CitieZ.csproj
@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +29,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Data.Sqlite">

diff --git a/CitieZ/Commands.cs b/CitieZ/Commands.cs
@@ -14,10 +14,10 @@ public static async void City(CommandArgs e)
                 return;
             }
             var city = await CitieZ.Cities.GetAsync(e.Parameters[0]);
-            if ((city != null) && (city.Discovered.Contains(e.Player.User.ID) || e.Player.HasPermission("citiez.all")))
+            if (city != null && (city.Discovered.Contains(e.Player.User.ID) || e.Player.HasPermission("citiez.all")))
             {
                 e.Player.SendInfoMessage(string.Format(CitieZ.Config.TeleportingToCity, city.Name));
-                e.Player.Teleport(city.Warp.X*16, city.Warp.Y*16);
+                e.Player.Teleport(city.Warp.X * 16, city.Warp.Y * 16);
             }
             else
             {

diff --git a/CitieZ/Db/CityManager.cs b/CitieZ/Db/CityManager.cs
@@ -141,7 +141,7 @@ public async Task<City> GetAsync(string name)
                     return
                         cities.Find(
                             c =>
-                                    c.Name.StartsWith(name, StringComparison.InvariantCultureIgnoreCase));
+                                c.Name.StartsWith(name, StringComparison.InvariantCultureIgnoreCase));
                 }
             });
         }

diff --git a/CitieZ/Properties/AssemblyInfo.cs b/CitieZ/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,7 +141,7 @@ public async Task<City> GetAsync(string name) @@
                         return
                             cities.Find(
                                 c =>
-                                        c.Name.StartsWith(name, StringComparison.InvariantCultureIgnoreCase));
+                                    c.Name.StartsWith(name, StringComparison.InvariantCultureIgnoreCase));
                     }
                 });
             }
@@ Expand Down @@