AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 04:32:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix core aliases being duplicated in /help for commands after doing /server reload.

Browse Source
This commit is contained in:
UnknownShadow200 2016-09-15 11:11:09 +10:00
parent 389264a7db
commit a1866472e9
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Player/Alias.cs → Commands/Alias.cs
View File

@ -1,23 +1,23 @@
/* /*
Copyright 2015 MCGalaxy Copyright 2015 MCGalaxy
Dual-licensed under the Educational Community License, Version 2.0 and Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS" software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace MCGalaxy { namespace MCGalaxy {
@ -50,7 +50,9 @@ namespace MCGalaxy {
} }
public static void Load(){ public static void Load(){
aliases = new List<Alias>(); aliases.Clear();
coreAliases.Clear();
if (!File.Exists(file)) { Save(); return; } if (!File.Exists(file)) { Save(); return; }
PropertiesFile.Read(file, LineProcessor, ':'); PropertiesFile.Read(file, LineProcessor, ':');
} }

2
MCGalaxy_.csproj
View File

@ -125,6 +125,7 @@
<Compile Include="Chat\FullCP437Handler.cs" /> <Compile Include="Chat\FullCP437Handler.cs" />
<Compile Include="Chat\ChatTokens.cs" /> <Compile Include="Chat\ChatTokens.cs" />
<Compile Include="Chat\LineWrapper.cs" /> <Compile Include="Chat\LineWrapper.cs" />
<Compile Include="Commands\Alias.cs" />
<Compile Include="Commands\Bots\CmdBotAdd.cs" /> <Compile Include="Commands\Bots\CmdBotAdd.cs" />
<Compile Include="Commands\Bots\CmdBotAI.cs" /> <Compile Include="Commands\Bots\CmdBotAI.cs" />
<Compile Include="Commands\Bots\CmdBotRemove.cs" /> <Compile Include="Commands\Bots\CmdBotRemove.cs" />
@ -575,7 +576,6 @@
<Compile Include="Network\NetUtils.cs" /> <Compile Include="Network\NetUtils.cs" />
<Compile Include="Network\Opcode.cs" /> <Compile Include="Network\Opcode.cs" />
<Compile Include="Network\Player.Networking.cs" /> <Compile Include="Network\Player.Networking.cs" />
<Compile Include="Player\Alias.cs" />
<Compile Include="API\API.cs" /> <Compile Include="API\API.cs" />
<Compile Include="Plugins\Plugin.cs" /> <Compile Include="Plugins\Plugin.cs" />
<Compile Include="Plugins\Plugin.Events.cs" /> <Compile Include="Plugins\Plugin.Events.cs" />