From c18c642b977462a6229638c1cdc5282bfe3b4fbb Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Sun, 6 Jun 2021 12:18:29 -0600 Subject: [PATCH] i think the death thing works now --- TODO.md | 4 +- .../Resurrection_jar/Resurrection.jar | Bin 1332094 -> 1333874 bytes .../Resurrection/Resurrection.class | Bin 1415 -> 1516 bytes .../commands/CommandResurrect.class | Bin 0 -> 3034 bytes .../Resurrection/Resurrection.java | 5 +- .../commands/CommandResurrect.java | 64 ++++++++++++++++++ 6 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class create mode 100644 src/net/brysonsteck/Resurrection/commands/CommandResurrect.java diff --git a/TODO.md b/TODO.md index 92787ef..8e217d5 100644 --- a/TODO.md +++ b/TODO.md @@ -2,11 +2,13 @@ ### Done! * get the player death event working +* figure out how to convert milliseconds to an actual date and time for the end user +* figure out commands and how to use them + * `about` ### For first release * figure out how to get the player.data file to add a user when one joins the server for the first time -* figure out how to convert milliseconds to an actual date and time for the end user * figure out commands and how to use them * `about` * `resurrect PLAYER` (resurrects a player now if needed) diff --git a/out/artifacts/Resurrection_jar/Resurrection.jar b/out/artifacts/Resurrection_jar/Resurrection.jar index 1a1705e5a31a60515f7b5a2cc84a3a2f0f15da04..5956672f6c092d90daa662ef518ac144128feea7 100644 GIT binary patch delta 24075 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 delta 22722 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 Wr?Wa{dd#%zGLs7GeOml>+5Z9A`ec~^ diff --git a/out/production/Resurrection/net/brysonsteck/Resurrection/Resurrection.class b/out/production/Resurrection/net/brysonsteck/Resurrection/Resurrection.class index 98142e0db5c35b2df9ada4742b07a7629debb443..f100f11a554ac670ee7164b0a7647c79637dd33e 100644 GIT binary patch delta 418 zcmZqYe#6am>ff$?3=9m`4E`IrE;EU8Fc>j1a2BN&mlhSJCYP`?m@qP!O}1mwl@5Z5 zaWNP(Fmp1PGgz=QSn@DfF<4K2#bm5y%g7)Z4Of(zpBJm(sh+Eln3GwSs>sD)&)~q$ z;K;+^#NfQyjhTPOq<~P1K^o|NS)iZfkgRfsx|Nf`lfesU fKFF=wKn!v#h9?c-8iheBycvAJDt&<@6N4WBxFa|$ delta 356 zcmaFE-OkN*>ff$?3=9m`3|jDupm2wBaqDlQNZBD;0)w3GH`-rL7I($JeX#7gk~3@i+MSPkHT z7{CKml*_;jHo75c##;Sm=H`%h`t%$jeiFr=x=6s%WS*wU@|##F5mgS-}%1ZcfRw- zqdRv2B=C6)8qla9q@oF7fraPvX+56P&58JM`kc(T0^xmzX}AXj8oRp36hs7;S@uLc zU7VUS+_*Gd!!5-}a(YSHEoecj0#!vD76>c~$Q|;<1)3+MTNW1R=}JB}mvU{xoJe#h z1Dk4;Cn8uVux)fwceR3VPRm--(M-$LRndXP z0&Y3erZ=pXGH9X?LO!82Ax5}sjA#Tu*?SVF^n8P}MWBbIAe=D_$k&*ISa#Nhj^ z=o-0rzm>~zo&wyx9vc*FRIv$N0*mVj2}BH6+PZ7mG*P2zurg0Qo3TZ~Ru#{pMcsJ} z!Lh!i7oI*9htTiyD8P$lHEL($**z9ziVdhZj3XpZUZ0ZvmYLDrlZHFVp5yAK7t)RO zXgEJHyxba8@e*EUmZoh>&t`PTeL9&3qYxNq#xV>l7*X*G$i6^|r%H}1^9-X^WH39+ zMhz=I!c=sbkW$Yx>qhC$QOnZC<#|oFCyIHdrL(35V>qecRTZba)avkwQoENiEO?r7 zW&~%*-4kBk^=k3ix)8WkgsqWLftfhZb2xvidb*N5& z?Xz*HUdYRXn`$p#0Z|ZWs{kuQrsIPf=76poizKKl2&{aHH~|SdJUahe)ZqBVfy*6r z&MnY1t>=s^70?51DOb--4e5nSAX`#a(ay-jtPG@h{~Y@Cc(i3s9I`BzM)bmvbSJH> z(;mjf7QBOZ6};zV@cRPmeTMrtnqf{`Q!-vIS>>cYtY^rwlEBx&bgl@Nl^!L5bJAI# zw5+LOp-xN#N3YrF-)@1$vfV_`73E^h>NyW&zn;sbcMak;2%UBy<<8wve4PLC?pHCLHXE}=VFZgfT{4>Ol{<6;2TLx65{ni&i23d{- zB*xjErKWGu$jcRCI2O7a`VLCyIzo-RnzsB3Y9k3Ey^&aC2HgTzvD)j!1@2*IZ*xqEHQ&PX zGuYdJ>;L{8Q*L7a3=THHGjRtm0=IGWWavgLT%JgR`g~J2F%(VR!U^wxn*YWd9<<9< zXyI7+KH9v+c7HJz4kF`V78wsQi;TSrvIs3kg2=*8Kt>a@(0ohtfzi#4@WSu~*0F8J z0xUu&qFBM_n1;pZ=BNitSnro&FJjEIX0G z6wpdrDkd#oGW6y*|MtZ#h-r}jf zo(%^fzJvSVqDZbz(+4}y)_PDpVje0`_&vmO1)CpW{jvvG#P1^~!GGMfMZ literal 0 HcmV?d00001 diff --git a/src/net/brysonsteck/Resurrection/Resurrection.java b/src/net/brysonsteck/Resurrection/Resurrection.java index 0b90c1b..bfd8363 100644 --- a/src/net/brysonsteck/Resurrection/Resurrection.java +++ b/src/net/brysonsteck/Resurrection/Resurrection.java @@ -1,6 +1,8 @@ package net.brysonsteck.Resurrection; import net.brysonsteck.Resurrection.commands.CommandAbout; +import net.brysonsteck.Resurrection.commands.CommandResurrect; +import org.bukkit.command.CommandExecutor; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; @@ -22,8 +24,9 @@ public class Resurrection extends JavaPlugin { // register commands this.getCommand("about").setExecutor(new CommandAbout()); + this.getCommand("resurrect").setExecutor(new CommandResurrect()); - System.out.println("Resurrection: I'm alive!"); + System.out.println("[Resurrection] I'm alive!"); } // end of spigot things diff --git a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java new file mode 100644 index 0000000..eb24e7d --- /dev/null +++ b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java @@ -0,0 +1,64 @@ +package net.brysonsteck.Resurrection.commands; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.GameMode; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.potion.PotionEffect; + +public class CommandResurrect implements CommandExecutor { + @Override + public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) { + boolean valid = (strings.length != 1); + + if (commandSender instanceof Player) { + Player p = (Player) commandSender; + if (valid) { + Player resurrectPlayer = Bukkit.getPlayer(strings[0]); + if (resurrectPlayer == null) { + p.sendMessage("That player does not exist! Failed to resurrect."); + return false; + } + if (resurrectPlayer.getGameMode() == GameMode.SPECTATOR) { + for (PotionEffect effect : resurrectPlayer.getActivePotionEffects()) + resurrectPlayer.removePotionEffect(effect.getType()); + resurrectPlayer.setGameMode(GameMode.SURVIVAL); + Bukkit.broadcastMessage(strings[0] + " has been resurrected manually by an admin!"); + return true; + } else { + p.sendMessage(strings[0] + " is not dead! Failed to resurrect."); + return false; + } + } else { + System.out.println("Too few arguments!"); + System.out.println("Usage: /resurrect PLAYER"); + return false; + } + } else { + if (valid) { + Player resurrectPlayer = Bukkit.getPlayer(strings[0]); + if (resurrectPlayer == null) { + System.out.println("That player does not exist! Failed to resurrect."); + return false; + } + if (resurrectPlayer.getGameMode() == GameMode.SPECTATOR) { + for (PotionEffect effect : resurrectPlayer.getActivePotionEffects()) + resurrectPlayer.removePotionEffect(effect.getType()); + resurrectPlayer.setGameMode(GameMode.SURVIVAL); + Bukkit.broadcastMessage(strings[0] + " has been resurrected manually by an admin!"); + return true; + } else { + System.out.println(strings[0] + " is not dead! Failed to resurrect."); + return false; + } + } else { + System.out.println("Too few arguments!"); + System.out.println("Usage: /resurrect PLAYER"); + return false; + } + } + } +}