aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryson Steck <steck.bryson@gmail.com>2022-01-05 14:17:01 -0700
committerBryson Steck <steck.bryson@gmail.com>2022-01-05 14:17:01 -0700
commit908cd6297c2be25db181ff47ad27549882636af4 (patch)
treeeda499832022329e113966fe7c0a40fe3017ac1a
parent7ab8389f0f2c61056fccbe827a105413300c0789 (diff)
downloadresurrection-908cd6297c2be25db181ff47ad27549882636af4.tar
resurrection-908cd6297c2be25db181ff47ad27549882636af4.tar.gz
resurrection-908cd6297c2be25db181ff47ad27549882636af4.tar.bz2
figuring out api stuff for recent minecraft releases
-rw-r--r--TODO.md10
-rw-r--r--src/net/brysonsteck/Resurrection/commands/CommandResurrect.java14
-rw-r--r--src/net/brysonsteck/Resurrection/player/PlayerListener.java20
-rw-r--r--src/plugin.yml2
4 files changed, 35 insertions, 11 deletions
diff --git a/TODO.md b/TODO.md
index fe4fb83..a7edf5c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,12 +5,12 @@
* 1.8
* Enables but crashes when trying to play ender dragon noise upon resurrection (ender dragon introduced in 1.9, wither noise instead? `Caused by: java.lang.NoSuchFieldError: ENTITY_ENDER_DRAGON_GROWL`)
* 1.9
- * Doesn't enable, "compiled by more recent version of java"
- * THIS SHOULD BE FIXED AFTER MOVING TO VSCODE (using java 8)
+ * seems to work now
* 1.10
- * same as 1.9
+ * seems to work now
* 1.11
- * same as 1.9
+ * seems to work now
* 1.12
- * same as 1.9
+ * seems to work now
+
diff --git a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java
index a2301b3..a026d31 100644
--- a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java
+++ b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java
@@ -61,7 +61,12 @@ public class CommandResurrect implements CommandExecutor {
resurrectPlayer.removePotionEffect(effect.getType());
resurrectPlayer.setGameMode(GameMode.SURVIVAL);
for(Player player : Bukkit.getOnlinePlayers()){
- player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ try {
+ player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ } catch (NoSuchFieldError e) {
+ log.warning("NoSuchFieldError encountered, playing Wither noise instead.");
+ player.playSound(player.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0);
+ }
}
Bukkit.broadcastMessage(ChatColor.YELLOW +""+ ChatColor.BOLD + strings[0] + " has been resurrected manually by an admin!");
removeDeath(resurrectPlayer);
@@ -108,7 +113,12 @@ public class CommandResurrect implements CommandExecutor {
resurrectPlayer.removePotionEffect(effect.getType());
resurrectPlayer.setGameMode(GameMode.SURVIVAL);
for(Player player : Bukkit.getOnlinePlayers()){
- player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ try {
+ player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ } catch (NoSuchFieldError e) {
+ log.warning("NoSuchFieldError encountered, playing Wither noise instead.");
+ player.playSound(player.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0);
+ }
}
Bukkit.broadcastMessage(strings[0] + " has been resurrected manually by an admin!");
removeDeath(resurrectPlayer);
diff --git a/src/net/brysonsteck/Resurrection/player/PlayerListener.java b/src/net/brysonsteck/Resurrection/player/PlayerListener.java
index 9a445e4..99d41b1 100644
--- a/src/net/brysonsteck/Resurrection/player/PlayerListener.java
+++ b/src/net/brysonsteck/Resurrection/player/PlayerListener.java
@@ -2,6 +2,9 @@ package net.brysonsteck.Resurrection.player;
import net.brysonsteck.Resurrection.startup.ParseSettings;
import net.brysonsteck.Resurrection.Resurrection;
+
+import java.util.logging.Logger;
+
import org.bukkit.*;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -24,6 +27,7 @@ public class PlayerListener implements Listener {
//Hashtable<String, Location> playerSpawns = new Hashtable<>();
ParseSettings parseSettings;
boolean DEBUG;
+ Logger log = JavaPlugin.getProvidingPlugin(Resurrection.class).getLogger();
public PlayerListener(ParseSettings parseSettings) {
this.parseSettings = parseSettings;
@@ -55,7 +59,7 @@ public class PlayerListener implements Listener {
boolean dead = Boolean.parseBoolean(playerSplit[1]);
timeToResurrection = Long.parseLong(playerSplit[2]);
- if (timeToResurrection < System.currentTimeMillis()) {
+ if (timeToResurrection < System.currentTimeMillis() && timeToResurrection != 0) {
dead = false;
playerSplit[1] = String.valueOf(dead);
timeToResurrection = 0;
@@ -144,7 +148,12 @@ public class PlayerListener implements Listener {
p.teleport(spawn);
}
for(Player p : Bukkit.getOnlinePlayers()){
- p.playSound(p.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ try {
+ p.playSound(p.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ } catch (NoSuchFieldError e) {
+ log.warning("NoSuchFieldError encountered, playing Wither noise instead.");
+ p.playSound(p.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0);
+ }
}
}
}.runTaskLater(JavaPlugin.getProvidingPlugin(Resurrection.class), timeToResurrection);
@@ -235,7 +244,12 @@ public class PlayerListener implements Listener {
p.teleport(spawn);
}
for(Player p : Bukkit.getOnlinePlayers()){
- p.playSound(p.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ try {
+ p.playSound(p.getLocation(), Sound.ENTITY_ENDER_DRAGON_GROWL, 1, 0);
+ } catch (NoSuchFieldError e) {
+ log.warning("NoSuchFieldError encountered, playing Wither noise instead.");
+ p.playSound(p.getLocation(), Sound.ENTITY_WITHER_DEATH, 1, 0);
+ }
}
}
}.runTaskLater(JavaPlugin.getProvidingPlugin(Resurrection.class), timeToResurrection);
diff --git a/src/plugin.yml b/src/plugin.yml
index 47b98a6..ff48360 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,7 +1,7 @@
main: net.brysonsteck.Resurrection.Resurrection
name: Resurrection
author: 'Bryson Steck'
-version: '1.2'
+version: '1.3'
website: https://brysonsteck.net/resurrection.html
description: Makes players wait large amounts of time before respawning!
database: false