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

Did stuff

Browse Source
This commit is contained in:
Dhruv Patel 2015-05-19 08:57:31 -04:00
parent 4dc1f5e6d5
commit 6d779cde54
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Block.cs
View File

@ -1966,7 +1966,7 @@ namespace MCGalaxy
case fishlavashark: return obsidian; case fishlavashark: return obsidian;
default: default:
if (b < 50) return b; else return 22; if (b < 66) return b; else return 22;
} }
} }
public static byte SaveConvert(byte b) public static byte SaveConvert(byte b)

11
Commands/CmdGoto.cs
View File

@ -136,7 +136,10 @@ namespace MCGalaxy.Commands
else if (Server.AutoLoad) else if (Server.AutoLoad)
{ {
if (!File.Exists("levels/" + message + ".lvl")) if (!File.Exists("levels/" + message + ".lvl"))
Player.SendMessage(p, "Level \"" + message + "\" doesn't exist!"); {
Player.SendMessage(p, "Level \"" + message + "\" doesn't exist! Did you mean...");
Command.all.Find("search").Use(p, "levels " + message);
}
else if (Level.Find(message) != null || Level.CheckLoadOnGoto(message)) else if (Level.Find(message) != null || Level.CheckLoadOnGoto(message))
{ {
Command.all.Find("load").Use(p, message); Command.all.Find("load").Use(p, message);
@ -146,7 +149,11 @@ namespace MCGalaxy.Commands
else else
Player.SendMessage(p, "Level \"" + message + "\" cannot be loaded using /goto!"); Player.SendMessage(p, "Level \"" + message + "\" cannot be loaded using /goto!");
} }
else Player.SendMessage(p, "There is no level \"" + message + "\" loaded."); else
{
Player.SendMessage(p, "There is no level \"" + message + "\" loaded. Did you mean..");
Command.all.Find("search").Use(p, "levels " + message);
}
GC.Collect(); GC.Collect();
GC.WaitForPendingFinalizers(); GC.WaitForPendingFinalizers();

6
Commands/CmdOverseer.cs
View File

@ -99,9 +99,9 @@ namespace MCGalaxy.Commands
{ {
if (par == "ADD") if (par == "ADD")
{ {
if ((File.Exists(@"levels\" + p.name.ToLower() + ".lvl")) || (File.Exists(@"levels\" + p.name.ToLower() + "00.lvl"))) if ((File.Exists("levels/" + p.name.ToLower() + ".lvl")) || (File.Exists("levels/" + p.name.ToLower() + "00.lvl")))
{ {
foreach(string filenames in Directory.GetFiles(@"levels\")) foreach(string filenames in Directory.GetFiles("levels"))
{ {
for(int i = 1; i < p.group.OverseerMaps + 2; i++) for(int i = 1; i < p.group.OverseerMaps + 2; i++)
{ {
@ -110,7 +110,7 @@ namespace MCGalaxy.Commands
i = 2; i = 2;
if(i != 0) if(i != 0)
{ {
if(!File.Exists(@"levels\" + p.name.ToLower() + i + ".lvl")) if(!File.Exists("levels/" + p.name.ToLower() + i + ".lvl"))
{ {
if(i > p.group.OverseerMaps) if(i > p.group.OverseerMaps)
{ {

2
Commands/CmdWhois.cs
View File

@ -33,7 +33,7 @@ namespace MCGalaxy.Commands
if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); } if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); }
if (who != null && !who.hidden) if (who != null && !who.hidden)
{ {
Player.SendMessage(p, who.color + who.name + Server.DefaultColor + " is on &b" + who.level.name); Player.SendMessage(p, who.color + who.name + " (" + p.DisplayName + ") " + Server.DefaultColor + " is on &b" + who.level.name);
Player.SendMessage(p, who.color + who.prefix + who.name + Server.DefaultColor + " has :"); Player.SendMessage(p, who.color + who.prefix + who.name + Server.DefaultColor + " has :");
Player.SendMessage(p, "> > the rank of " + who.group.color + who.group.name); Player.SendMessage(p, "> > the rank of " + who.group.color + who.group.name);
try try

16
MCGalaxy.userprefs
View File

@ -1,11 +1,10 @@
<Properties> <Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
<MonoDevelop.Ide.Workbench ActiveDocument="Player/Player.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Commands/CmdOverseer.cs">
<Files> <Files>
<File FileName="Commands/CmdCuboid.cs" Line="439" Column="40" /> <File FileName="Commands/CmdCuboid.cs" Line="439" Column="40" />
<File FileName="Commands/Command.cs" Line="120" Column="30" /> <File FileName="Commands/Command.cs" Line="120" Column="30" />
<File FileName="Player/Player.cs" Line="2076" Column="18" /> <File FileName="Player/Player.cs" Line="2745" Column="38" />
<File FileName="Server.cs" Line="167" Column="40" />
<File FileName="Commands/CmdAbort.cs" Line="1" Column="1" /> <File FileName="Commands/CmdAbort.cs" Line="1" Column="1" />
<File FileName="Commands/CmdCopy.cs" Line="1" Column="1" /> <File FileName="Commands/CmdCopy.cs" Line="1" Column="1" />
<File FileName="Commands/CmdFill.cs" Line="1" Column="1" /> <File FileName="Commands/CmdFill.cs" Line="1" Column="1" />
@ -24,15 +23,20 @@
<File FileName="Commands/CmdJail.cs" Line="66" Column="31" /> <File FileName="Commands/CmdJail.cs" Line="66" Column="31" />
<File FileName="Commands/CmdPromote.cs" Line="1" Column="1" /> <File FileName="Commands/CmdPromote.cs" Line="1" Column="1" />
<File FileName="Commands/CmdSetRank.cs" Line="173" Column="1" /> <File FileName="Commands/CmdSetRank.cs" Line="173" Column="1" />
<File FileName="Color.cs" Line="86" Column="28" />
<File FileName="ForgeBot.cs" Line="94" Column="42" />
<File FileName="Commands/CmdWhois.cs" Line="36" Column="92" />
<File FileName="Commands/CmdGoto.cs" Line="140" Column="104" />
<File FileName="Commands/CmdOverseer.cs" Line="163" Column="7" />
</Files> </Files>
<Pads> <Pads>
<Pad Id="ProjectPad"> <Pad Id="ProjectPad">
<State expanded="True"> <State expanded="True">
<Node name="MCGalaxy_" expanded="True"> <Node name="MCGalaxy_" expanded="True">
<Node name="Commands" expanded="True" /> <Node name="Commands" expanded="True">
<Node name="Player" expanded="True"> <Node name="CmdOverseer.cs" selected="True" />
<Node name="Player.cs" selected="True" />
</Node> </Node>
<Node name="Player" expanded="True" />
</Node> </Node>
</State> </State>
</Pad> </Pad>

1
Player/Player.cs
View File

@ -2742,6 +2742,7 @@ return;
StringBuilder sb = new StringBuilder(message); StringBuilder sb = new StringBuilder(message);
if ( colorParse ) { if ( colorParse ) {
sb.Replace("%r", "&f");
for ( int i = 0; i < 10; i++ ) { for ( int i = 0; i < 10; i++ ) {
sb.Replace("%" + i, "&" + i); sb.Replace("%" + i, "&" + i);
sb.Replace("&" + i + " &", " &"); sb.Replace("&" + i + " &", " &");