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

Core: Fix changing main from server gui not working. (Thanks C1ASSIC)

Browse Source
This commit is contained in:
UnknownShadow200 2016-12-10 09:03:07 +11:00
parent 5f29c59e27
commit f9e0cb4960
4 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GUI/PropertyWindow.cs
View File

@ -583,7 +583,9 @@ namespace MCGalaxy.Gui {
try { Server.restarttime = DateTime.Parse(txtRestartTime.Text); }
catch { } // ignore bad values
Server.restartOnError = chkRestart.Checked;
Server.level = ( Player.ValidName(txtMain.Text) ? txtMain.Text : "main" );
string main = Player.ValidName(txtMain.Text) ? txtMain.Text : "main";
Server.SetMainLevel(main);
Server.irc = chkIRC.Checked;
Server.ircNick = txtNick.Text;
Server.ircServer = txtIRCServer.Text;

26
MCGalaxy/Commands/World/CmdMain.cs
View File

@ -30,32 +30,22 @@ namespace MCGalaxy.Commands.World {
public override void Use(Player p, string message) {
if (message == "") {
if (p.level.name == Server.mainLevel.name) {
Player.Message(p, "You are already on the server's main level."); return;
if (Player.IsSuper(p)) {
Player.Message(p, "Main level is {0}", Server.mainLevel.ColoredName);
} else if (p.level.name == Server.mainLevel.name) {
Player.Message(p, "You are already on the server's main level.");
} else {
PlayerActions.ChangeMap(p, Server.mainLevel);
}
PlayerActions.ChangeMap(p, Server.mainLevel);
} else {
if (!CheckExtraPerm(p)) { MessageNeedExtra(p, "change the main level"); return; }
if (!Formatter.ValidName(p, message, "level")) return;
string map = LevelInfo.FindMapMatches(p, message);
if (map == null) return;
Level oldMain = Server.mainLevel;
Level match = LevelInfo.FindExact(map);
if (match != null) {
Server.mainLevel = match;
} else {
Server.mainLevel = Level.Load(map);
LevelInfo.Loaded.Add(Server.mainLevel);
}
oldMain.unload = true;
Server.mainLevel.unload = false;
Server.level = map;
Server.SetMainLevel(map);
SrvProperties.Save();
Player.Message(p, "Set main level to \"{0}\"", map);
Player.Message(p, "Set main level to {0}", Server.mainLevel.ColoredName);
}
}

89
MCGalaxy/Commands/building/CmdDrill.cs
View File

@ -14,11 +14,11 @@
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
*/
using System.Collections.Generic;
namespace MCGalaxy.Commands.Building {
public sealed class CmdDrill : Command {
public sealed class CmdDrill : Command {
public override string name { get { return "drill"; } }
public override string shortcut { get { return ""; } }
public override string type { get { return CommandTypes.Building; } }
@ -35,58 +35,57 @@ namespace MCGalaxy.Commands.Building {
bool DoDrill(Player p, Vec3S32[] marks, object state, byte type, byte extType) {
ushort x = (ushort)marks[0].X, y = (ushort)marks[0].Y, z = (ushort)marks[0].Z;
type = p.level.GetTile(x, y, z); extType = 0;
if (type == Block.custom_block)
if (type == Block.custom_block)
extType = p.level.GetExtTile(x, y, z);
int dist = (int)state;
int dx = 0, dz = 0;
DirUtils.FourYaw(p.rot[0], out dx, out dz);
List<int> buffer = new List<int>();
int depth = 0;
Level lvl = p.level;
if (dx != 0) {
for (ushort xx = x; depth < dist; xx += (ushort)dx)
{
for (ushort yy = (ushort)(y - 1); yy <= (ushort)(y + 1); yy++)
for (ushort zz = (ushort)(z - 1); zz <= (ushort)(z + 1); zz++)
{
buffer.Add(lvl.PosToInt(xx, yy, zz));
}
depth++;
}
} else {
for (ushort zz = z; depth < dist; zz += (ushort)dz)
{
for (ushort yy = (ushort)(y - 1); yy <= (ushort)(y + 1); yy++)
for (ushort xx = (ushort)(x - 1); xx <= (ushort)(x + 1); xx++)
{
buffer.Add(lvl.PosToInt(xx, yy, zz));
}
depth++;
}
}
if (buffer.Count > p.group.maxBlocks) {
Player.Message(p, "You tried to drill " + buffer.Count + " blocks.");
int dist = (int)state, numBlocks = (3 * 3) * dist;
if (numBlocks > p.group.maxBlocks) {
Player.Message(p, "You tried to drill " + numBlocks + " blocks.");
Player.Message(p, "You cannot drill more than " + p.group.maxBlocks + ".");
return false;
}
foreach (int index in buffer) {
if (index < 0) continue;
lvl.IntToPos(index, out x, out y, out z);
byte tile = lvl.blocks[index], extTile = 0;
if (tile == Block.custom_block) extTile = lvl.GetExtTile(x, y, z);
bool sameBlock = type == Block.custom_block ? extType == extTile : type == tile;
if (sameBlock) p.level.UpdateBlock(p, x, y, z, Block.air, 0, true);
int dx = 0, dz = 0;
DirUtils.FourYaw(p.rot[0], out dx, out dz);
Level lvl = p.level;
if (dx != 0) {
for (int depth = 0; depth < dist; x += (ushort)dx, depth++) {
if (x >= lvl.Width) continue;
for (ushort yy = (ushort)(y - 1); yy <= (ushort)(y + 1); yy++)
for (ushort zz = (ushort)(z - 1); zz <= (ushort)(z + 1); zz++)
{
DoBlock(p, lvl, type, extType, x, yy, zz);
}
}
} else {
for (int depth = 0; depth < dist; z += (ushort)dz, depth++) {
if (z >= lvl.Length) break;
for (ushort yy = (ushort)(y - 1); yy <= (ushort)(y + 1); yy++)
for (ushort xx = (ushort)(x - 1); xx <= (ushort)(x + 1); xx++)
{
DoBlock(p, lvl, type, extType, xx, yy, z);
}
}
}
Player.Message(p, "Drilled " + buffer.Count + " blocks.");
Player.Message(p, "Drilled " + numBlocks + " blocks.");
return true;
}
void DoBlock(Player p, Level lvl, byte block, byte extBlock,
ushort x, ushort y, ushort z) {
int index = lvl.PosToInt(x, y, z);
if (index == -1) return;
byte cur = lvl.blocks[index], extCur = 0;
if (cur == Block.custom_block) extCur = lvl.GetExtTile(x, y, z);
bool same = block == Block.custom_block ? extBlock == extCur : block == cur;
if (same) p.level.UpdateBlock(p, x, y, z, Block.air, 0, true);
}
public override void Help(Player p) {
Player.Message(p, "%T/drill [distance]");
Player.Message(p, "%HDrills a hole, destroying all similar blocks in a 3x3 rectangle ahead of you.");

20
MCGalaxy/Server/Server.cs
View File

@ -20,6 +20,7 @@ using System.IO;
using System.Net;
using System.Net.Sockets;
using MCGalaxy.Blocks;
using MCGalaxy.Commands.World;
using MCGalaxy.Games;
using MCGalaxy.Tasks;
using MCGalaxy.Util;
@ -394,5 +395,24 @@ namespace MCGalaxy {
public static string FindColor(string name) {
return Group.findPlayerGroup(name).color;
}
/// <summary> Sets the main level of the server that new players spawn in. </summary>
/// <returns> true if main level was changed, false if not
/// (same map as current main, or given map doesn't exist).</returns>
public static bool SetMainLevel(string mapName) {
if (mapName.CaselessEq(level)) return false;
Level oldMain = mainLevel;
Level lvl = LevelInfo.FindExact(mapName);
if (lvl == null)
lvl = CmdLoad.LoadLevel(null, mapName);
if (lvl == null) return false;
oldMain.unload = true;
mainLevel = lvl;
mainLevel.unload = false;
level = mapName;
return true;
}
}
}