From d11e749ea0351948a50e4b11673165dee719e387 Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Tue, 15 Jun 2021 18:49:36 -0600 Subject: shortened death time to test resurrection --- out/artifacts/Resurrection_jar/Resurrection.jar | Bin 1338355 -> 1338433 bytes .../Resurrection/commands/CommandResurrect.class | Bin 3056 -> 3034 bytes .../Resurrection/player/PlayerListener.class | Bin 3930 -> 3939 bytes .../Resurrection/startup/CheckForUpdate.class | Bin 2478 -> 2700 bytes .../Resurrection/commands/CommandResurrect.java | 2 +- .../Resurrection/player/PlayerListener.java | 2 +- .../Resurrection/startup/CheckForUpdate.java | 4 +++- 7 files changed, 5 insertions(+), 3 deletions(-) diff --git a/out/artifacts/Resurrection_jar/Resurrection.jar b/out/artifacts/Resurrection_jar/Resurrection.jar index 19b225b..efbcf5b 100644 Binary files a/out/artifacts/Resurrection_jar/Resurrection.jar and b/out/artifacts/Resurrection_jar/Resurrection.jar differ diff --git a/out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class b/out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class index c22d073..6c06b2b 100644 Binary files a/out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class and b/out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class differ diff --git a/out/production/Resurrection/net/brysonsteck/Resurrection/player/PlayerListener.class b/out/production/Resurrection/net/brysonsteck/Resurrection/player/PlayerListener.class index 9320728..b1e801e 100644 Binary files a/out/production/Resurrection/net/brysonsteck/Resurrection/player/PlayerListener.class and b/out/production/Resurrection/net/brysonsteck/Resurrection/player/PlayerListener.class differ diff --git a/out/production/Resurrection/net/brysonsteck/Resurrection/startup/CheckForUpdate.class b/out/production/Resurrection/net/brysonsteck/Resurrection/startup/CheckForUpdate.class index 2e26831..8434267 100644 Binary files a/out/production/Resurrection/net/brysonsteck/Resurrection/startup/CheckForUpdate.class and b/out/production/Resurrection/net/brysonsteck/Resurrection/startup/CheckForUpdate.class differ diff --git a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java index f05de5d..a969687 100644 --- a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java +++ b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java @@ -22,7 +22,7 @@ public class CommandResurrect implements CommandExecutor { p.sendMessage("That player does not exist! Failed to resurrect."); return false; } - if (resurrectPlayer.getGameMode() == GameMode.ADVENTURE) { + if (resurrectPlayer.getGameMode() == GameMode.SPECTATOR) { for (PotionEffect effect : resurrectPlayer.getActivePotionEffects()) resurrectPlayer.removePotionEffect(effect.getType()); resurrectPlayer.setGameMode(GameMode.SURVIVAL); diff --git a/src/net/brysonsteck/Resurrection/player/PlayerListener.java b/src/net/brysonsteck/Resurrection/player/PlayerListener.java index bec8abb..8bc299f 100644 --- a/src/net/brysonsteck/Resurrection/player/PlayerListener.java +++ b/src/net/brysonsteck/Resurrection/player/PlayerListener.java @@ -36,7 +36,7 @@ public class PlayerListener implements Listener { new Thread (() -> { try { - Thread.sleep(86400000); + Thread.sleep(5000); } catch (InterruptedException interruptedException) { interruptedException.printStackTrace(); p.sendMessage("Failed to make the thread sleep!"); diff --git a/src/net/brysonsteck/Resurrection/startup/CheckForUpdate.java b/src/net/brysonsteck/Resurrection/startup/CheckForUpdate.java index be30844..56893d8 100644 --- a/src/net/brysonsteck/Resurrection/startup/CheckForUpdate.java +++ b/src/net/brysonsteck/Resurrection/startup/CheckForUpdate.java @@ -20,9 +20,11 @@ public class CheckForUpdate { String json = urlReader(); JsonElement root = new JsonParser().parse(json); JsonObject rootobj = root.getAsJsonObject(); - JsonElement softwareElement = rootobj.get("resurrection"); + JsonElement softwareElement = rootobj.getAsJsonObject("resurrection"); JsonObject softwareObj = softwareElement.getAsJsonObject(); version = softwareObj.get("current-release").toString(); + version = version.replace("\"", ""); + versionURL = softwareObj.get("github-release").toString(); // version = rootobj.get("current-version").getAsString(); // versionURL = rootobj.get("release-url").getAsString(); } catch (IOException e) { -- cgit v1.2.3