Skip to content

Commit 0f5f6a4

Browse files
author
FungY911
committed
fix toggle to start/stop
1 parent 40fc995 commit 0f5f6a4

File tree

3 files changed

+26
-17
lines changed

3 files changed

+26
-17
lines changed

src/main/java/tk/fungy/wsformc/Command.java

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
3636
"/wsm status\n" +
3737
"/wsm \n");
3838
return true;
39-
case "toggle":
40-
sender.sendMessage("Toggling...");
41-
if (new FileManager().getBooleanFromConfig("WebServer.isRunning")) {
42-
FileManager.setStringInConfig("WebServer.isRunning", String.valueOf(true));
43-
} else {
44-
FileManager.setStringInConfig("WebServer.isRunning", String.valueOf(false));
45-
}
39+
case "start":
40+
sender.sendMessage("Starting...");
4641
WebServer server = new WebServer();
47-
server.toggle();
42+
server.start();
43+
return true;
44+
case "stop":
45+
sender.sendMessage("Stopping...");
46+
WebServer wsm = new WebServer();
47+
wsm.stopServer();
4848
return true;
4949
case "reload":
5050
switch (args[1]) {
@@ -60,7 +60,13 @@ public boolean onCommand(CommandSender sender, org.bukkit.command.Command comman
6060
sender.sendMessage("Reloaded");
6161
return true;
6262
}
63-
sender.sendMessage("config, plugin");
63+
sender.sendMessage("config, plugin");
64+
return true;
65+
case "status":
66+
sender.sendMessage("Is Active: " + new FileManager().getBooleanFromConfig("WebServer.isRunning"));
67+
sender.sendMessage("Uptime: null");
68+
sender.sendMessage("Enable Log: null\n");
69+
sender.sendMessage("Created by FungYY911 for everyone");
6470
return true;
6571
default:
6672
sender.sendMessage("Command not found!");

src/main/java/tk/fungy/wsformc/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void onEnable() {
2727
getLogger().info("Loading WebServer.");
2828
if (Boolean.parseBoolean(new FileManager().getStringFromConfig("WebServer.isRunning")) == true) {
2929
WebServer server = new WebServer();
30-
server.toggle();
30+
server.start();
3131
}
3232
getLogger().info("Loading Commands.");
3333
instance.getCommand("wsm").setExecutor(new Command());

src/main/java/tk/fungy/wsformc/WebServer.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,30 @@ public WebServer() {
2525
//TODO:
2626
//TODO: FIX TOGGLE V CONFIGU A CHATE ATD..
2727
//TODO:
28-
public void toggle() {
28+
public void start() {
29+
running = !running;
2930
if (running) {
3031
try {
3132
start(NanoHTTPD.SOCKET_READ_TIMEOUT, false);
3233
FileManager.setStringInConfig("WebServer.isRunning", String.valueOf(true));
3334
if (secureb) {
3435
Main.getInstance().getLogger().warning("Running! https://" + domain + ":" + port + "/");
3536
} else {
36-
Main.getInstance().getLogger().warning("Running! http://" + domain + ":"+ port + "/");
37+
Main.getInstance().getLogger().warning("Running! http://" + domain + ":" + port + "/");
3738
}
3839
} catch (IOException e) {
3940
Main.getInstance().getLogger().warning("Couldn't start server: " + e.getMessage());
4041
FileManager.setStringInConfig("WebServer.isRunning", String.valueOf(false));
42+
running = false;
4143
}
42-
} else {
43-
stop();
44-
FileManager.setStringInConfig("WebServer.isRunning", String.valueOf(false));
45-
Main.getInstance().getLogger().warning("Server stopped");
4644
}
4745
}
48-
46+
public void stopServer() {
47+
stop();
48+
running = false;
49+
FileManager.setStringInConfig("WebServer.isRunning", String.valueOf(false));
50+
Main.getInstance().getLogger().warning("Server stopped");
51+
}
4952
@Override
5053
public Response serve(IHTTPSession session) {
5154
String uri = session.getUri();

0 commit comments

Comments
 (0)