From ab9dc24bc2be13ac823dff25b0e49189ac2458be Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Sun, 24 Mar 2019 00:43:05 +0100 Subject: [PATCH] made it more modular; fixed some bugs and null pointers Signed-off-by: Yaruma3341 --- config.yml | 3 +-- .../me/yaruma/fightsystem/FightSystem.class | Bin 15824 -> 15564 bytes .../fightsystem/fight/WaterRemover.class | Bin 317 -> 5499 bytes .../listener/EntityExplodeListener.class | Bin 1002 -> 1563 bytes .../utils/countdown/Countdown.class | Bin 2894 -> 3121 bytes .../WinconditionPercentSystem.class | Bin 3020 -> 3283 bytes src/me/yaruma/fightsystem/FightSystem.java | 15 ++++-------- .../fightsystem/fight/FightManager.java | 4 ++-- .../yaruma/fightsystem/fight/FightTeam.java | 3 --- src/me/yaruma/fightsystem/kit/KitManager.java | 1 - .../listener/PlayerInteractListener.java | 4 ---- .../listener/PlayerJoinListener.java | 5 ++-- .../fightsystem/manager/FileManager.java | 11 --------- .../utils/countdown/Countdown.java | 3 ++- .../winconditions/WinconditionAllDead.java | 1 - .../winconditions/WinconditionEntern.java | 22 ++++++++++++++++++ .../winconditions/WinconditionTimeout.java | 16 +++++++++++++ 17 files changed, 50 insertions(+), 38 deletions(-) create mode 100644 src/me/yaruma/fightsystem/winconditions/WinconditionEntern.java diff --git a/config.yml b/config.yml index 7fc7486..1dbc12b 100644 --- a/config.yml +++ b/config.yml @@ -5,7 +5,6 @@ Times: SpectatorDuration: 0 Arena: - WorldName: worldName Schemsize: x: 0 y: 0 @@ -37,6 +36,7 @@ WinConditions: AllDead: boolean CaptainDead: boolean PercentSystem: boolean + Entern: boolean WinConditionParams: TimeoutTime: 0 @@ -44,7 +44,6 @@ WinConditionParams: PercentWin: 0 Fight: - Entern: boolean OnlyPublicSchematics: boolean Money: diff --git a/out/artifacts/production/Diamant-ix FightSystem/me/yaruma/fightsystem/FightSystem.class b/out/artifacts/production/Diamant-ix FightSystem/me/yaruma/fightsystem/FightSystem.class index 53ee4566357aeae89c8e4740b496b672da2f4152..b0275825b6dd4cd7f5d43abb8775fb32c1f968b6 100644 GIT binary patch literal 15564 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 delta 137 zcmW-XK?=e^5Cm&iXE(;EA);5wO>*(#N5rT2l=(?RW27-SfFXVbutN|SdtwJaVjL#|#KRH7krYwMCe;!h(J-2!MkC66 zia)@~Hui#qEK*)&kx!ziB&P@DNCgyC+1&2Fk8{tx-M9bx`}aQpOrw-QFUAu11mj7h zFpO_ zmKno3UUvP;mcWOtfsxLcH5R6dM>qmgtuE(b3tTLOva+=zx1)+J%&@@%SMm+=si~5# zYjz{;d44EE?R#v-@W})b(WR)=fK(C%zY$c_f;N4<+E#qCH+MJXjEp(2W+pLH$C~|Lv+I5yg70A#J1SU@eoO#m%-BE=G zk!Y!j?0X8ty$O&cfcX&2n?KQsrh$H`)7hNF zWb@_vIw!bo_TM8-lrV}OetLX$`~f?-ayBUYd2+Z4uJOrVA>Ksh0m`mOnZRZ4?IQ;a zVu&ZE!4-m-;9t1LxGvq^L&rWk1y-i^5fgZYN8H2(-k~dZXCIcpTU_`Fz0H01YxMnw z#2%8=*aCaF`13!1n*5zG`3DiF?7KW1ij*J%;> jh}r?f4w0}he27U4BM0a?Alp$|Ol>#03f!XXz{mdrAHJkr delta 340 zcmXYrJu^c=7=@p`xyf?xip0kyNZjiyBq5lzS{;QSK(Fu@lqyB$R>lv|(lAjNrSVhD zC^g35Y-rAT&%3+N*=zS^yRYAmPe6~|h!N%^7O2NGSd2-@yewIkEi0B)%Ub{FCEqjq zrkP)u(=;NstUESnS=x>co0g_yi>_mvoxB><3Wi>O5+?oIMt&K5oReYIWEfR#AQwdH zl)7>wFSZ^qcf;c`X=%8OC~J0q7Z|6aWT-MBh<|*h6w0&qJ;4Cg9&`qThAS!>iiT%O zhd0MR@19)1lgo0ib#YRWd_y9hDE|$9nq*4sX>DVIFCt6wsW_vB|JtnFP?HAC{Q|0_ BB%S~O diff --git a/out/artifacts/production/Diamant-ix FightSystem/me/yaruma/fightsystem/utils/countdown/Countdown.class b/out/artifacts/production/Diamant-ix FightSystem/me/yaruma/fightsystem/utils/countdown/Countdown.class index 7a330d3d0d3c50710c1fdbfcdc9960b5e6a510a2..3e2e330bb5f3d65772ff7f19856b625e070d7132 100644 GIT binary patch literal 3121 zcmbVOTUQfT6#h;U7%~|Y5mCXmQc#mf4dC6NRk3JnP-`d_dz~a>7@17y%ml?=9=d$( z59so}ed$AQqSUpz+SmSt{)PSmS6A(KW|DMdflJ84x$gb#Z|}4Bp8WamufG8}f-mFf z#br6Xtzr-Iay6x*4_6diRdEgP#5r77QNVNp?_x&54HXHz*G6^u>q%f1H>KM9QfNkQ zKac<)%Hbn9e5~LTl>)jPiV2iZR8W>Tc?E`mma}ccnXq)%HCzF;RIA%wxpv3qW=H5ezefH?yDlk4D4%GekD*k>i__64h6F>Qgtmr$T{#rpib=@m+IM!9bJ zmhv^Hk_nD8Zu2~I{&_jFPLy=JWLOP?(WJD#H8?wG1;>nsFk7d-OHXBs}o7Xq0LB5OD<-F*{h{TkiAM)wrx@=q<@u4JwjZyO~~ z;P?jZG~Y)cs+Y^`)5)L-hd{Hbn*sxCRheH}48dcImpY zVCbG{SEl(%5jdO-yBGA=Oc2m)=vA)QZCid1vX?K*x>g(Q(T9j7bAEGnjB0I>A&t4_ zJx*+zl#DVaGK#rW2rWpQEC%>Z-^2d_F{rZ0Ah4Ia2+t$3{QNa*(Vv;+oK?ykK$2sM zyRRu1<-9Nb2+?%^LqyWU44)SJi0E%I}!5!g!GQwX;IuRV=x(nhNRiX+qLcs`6Sj!k|P^+NBM;UmG z_zF~ksr2x{CrHeasuu4-=L)tec!(}ZE8^4I;w$u%(jHP63sD(pQ5nEt{_$dpVi%6$ z7&TdbIMFbA(cc3*9%Ebj7j&(lJAxn@+i$EkbQBr^dZ;da)(AnxhM_o4wm@$+KnDo4 zjGkCI+xGyy-1IGD$M5J}#?JeA_T96;{||6CLkpZjC$bFoDSC6dWhBlZpYq>Q1~HDv zKZuK`jDDQL;|)i?qRj}e$C@_B`yb!{H~meUyVBpHD}1o?z95OeR+BhO66b0BEZ^pW zPokH|ai)+YA$=Yrxig$49TibYXW%K?c*jQA;3GpWWmQI1tYEjm58MUM*6!b2Y&j@V z{LJa^+Xd^=8`&G*Eka8O)WZF^r0^V9fS**6aw(?}l@-aS!Y5HcY z%rbcq0WBcF{Jq%9fkFQ@fW#B@%|1f^&xpxD3qNmz03;}K$@eRVS2)W`O>pM#KW3!| A8UO$Q delta 1212 zcmZvb$xjqf5XQgmS(@&7!#WJh2r`PI4LY)@Y$76vinxK|xS;GPD42LOnZ$7PHb-tA z^uj?vHc5Hv;sKUnGQ^xFwdi#i(1hJ>t_V!yOs!8tAiVa8HJ0 z2=|dR@IY=l4LsE5-@en*?fOP$xaZZt&_wsZbnn368@bu;5^)p*lrP= zc1VgL=;(n=)NTh&VbqHnXQXB1_=lT{XA$M5cp150k++P<47NUO{gzyOP9<|$L!cgE zG%%Zb=F_x8FG^SWjsg3e9HPKwfjPM>6Fpc&`92njDjfD!b$J_V_6vlt2NqTS63oW4oO-m`zA)O3Ek)gI~t*A&V6lKzCQxZEjB^|U*0TrsE zC|;EUPB@Qf8Vs$h<%>MHSiZUZ1AOpb@WG`n_er9*u$B+^`}WyqpMCbe-#$MU{Zt&g z`q#JL0gcRgxPcB2_pr-N1G}}=sjWRG_jz!Ld`9&nNm-w^GOLt65VuTi9waZSfq> zTWqA!;ss7vY~n_RvnLW6Hh9tEB~IF1j`Eh5EneZ2!U&H9dxpXxgI6tVUNbmu@j7o< zoMy)2jE1us&S`j4!&}VQaYxzyw=Le`q`|uu=XuX!9qTRL=L3TeEk0sK;fRJq7MoeG zC>jV(1_MLEk>0?b@o4`@Z|g+=P$(Q#sB(*s`9#B~7N7CCUEwURGWf#cODb zeetY@goX|Js*7B(+ng=#Z!D5rQZ(B~U4{0~s@nd+`D^8}NVGT5Gch>WKOSgJks_}r z8VQCD1;@tQ!((H?-mqP7_*9)fm$>2@P-;yoMVB!d%MOl?hDSn*2LH}$OK+;V&Xwt= zNm1%=`@d~-Jd*BTk?+4gP!g;j4hN>}V=k}#oAFC?gAA=AfD5<&!7|Bi-MuhcmCXDO8YMf0psbSEhE7V9g;n-}Vv#Wys)<1!@&E>Y@TnWU^H$*LsfI;19*XtgAo zK7B4-(kyF|tc}GN)>@IizA{Z!Y05bBGPPwk|0y*SbZx0yXQ^ITYPGEYEpkCMvH!~P zOF8kl{A>qWlnxOBR+3E_xvZjqa(t}iFctF7E19NBUSzdA2|x4H@I7^0A)rcFr|RTQ zZDxbo&PKJ1O=`D@uSIPX;cOX$TWQ515k6umQ>&R#T3ff#CW`yi7H(&|sD6hW&BvAd zCkcZ)9lygLoY2Hw@?}fx4q=nK({m+uXKJFLc8;thPOnHI5~j>rG5a!hU9vH?s88V2 eovT#mg?hYX^m14sSS&pkN`D2iyHosGwEqn-l`=H| delta 1211 zcmZ9L*>jUs7{-66N&781sWshOEXB6cP^3Vkpaon}*;GJ4T%du(E|!S3Y%0d8P;o>0 zsiiC``WH0OO!0ylZymkz%3+2XFZ3_)%0Y+sO@dRIZ{~U4?VRsD?{m(t%|AD0fBN@_ zD?oy8eeU9MpC{Ph(Zxo!HmSAQWsA>~JmvE=TO({^yXKxz*rBjfVVAbb^w|D%W_;IhCV$lIGv-Kewc=RI3RXHCwH)JhOAkveZ}6t&Zk7ed zL+y#9cX`ipf|Hg>h4&RsDSV*tAt!^Yp|%|#Sw7|yhtrl%Ib-Q2 zZkZx*_{{RTRxa1b7xY_ti91YN&N5>;$9c;IEx4%grNR;|{fe1jYq&j_4zKgRwp`*H z!`k3Sry=;$EDl;L|1dr3<#$$%n1=f9%_GUf$==aqX0Uhr_}Fk}us^;bxZ<3Sda2}r zIyFBlz|pUhHS_RCebsaqMVDRBE7u^IYv)XM&Km#H@lep*YvTu`DrN>mJH3*2m|oW0pkx$4$_`f{|*@25@t z|N6P5kA>RDtc))t4-p=wMsT5wuU$soL7GmohvY#_h?=KF%_-6Hg6Mcrl>3Wb6K1)o zVTEaCrRgAHIz~2N|tI;)=RB5tQFm=O(W}gK(u>MR@PDJ{lk>Q zL!rOnIw!Kq(iw7<437xAJX*RQVyB8116I#bQ6L;^7gh2!mAyqpjf#mo#T+V!J4$wE lo(4U;DW1JW_J?{oce8vga_CmMhD}6Q$sIGSmt+Nx-2jTE;T!+} diff --git a/src/me/yaruma/fightsystem/FightSystem.java b/src/me/yaruma/fightsystem/FightSystem.java index a8b4ff0..b70d886 100644 --- a/src/me/yaruma/fightsystem/FightSystem.java +++ b/src/me/yaruma/fightsystem/FightSystem.java @@ -10,9 +10,7 @@ import me.yaruma.fightsystem.manager.FileManager; import me.yaruma.fightsystem.utils.WorldEdit; import me.yaruma.fightsystem.utils.countdown.*; import me.yaruma.fightsystem.utils.scoreboard.Scoreboard; -import me.yaruma.fightsystem.winconditions.WinconditionAllDead; -import me.yaruma.fightsystem.winconditions.WinconditionCaptainDead; -import me.yaruma.fightsystem.winconditions.WinconditionPercentSystem; +import me.yaruma.fightsystem.winconditions.*; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; @@ -110,7 +108,7 @@ public class FightSystem extends JavaPlugin { int schem2BorderX = fileManager.getIntegerFromConfig("Arena.Schem2Border.x"); int schem2BorderZ = fileManager.getIntegerFromConfig("Arena.Schem2Border.z"); - World world = Bukkit.getWorld(fileManager.getStringFromConfig("Arena.WorldName")); + World world = Bukkit.getWorlds().get(0); underArenaBorder = fileManager.getIntegerFromConfig("Arena.underArenaBorder"); @@ -298,13 +296,8 @@ public class FightSystem extends JavaPlugin { setAllPlayersGM(GameMode.SURVIVAL); if(fileManager.getBooleanFromConfig("WinConditions.Timeout")) { - int timeTimeOver = fileManager.getIntegerFromConfig("WinConditionParams.TimeoutTime"); - Countdown countdownTimeOver = new Countdown(timeTimeOver, new FinishTimeOver()); - countdownTimeOver.startTimer(plugin); - - int timeNoEntern = fileManager.getIntegerFromConfig("WinConditionParams.EnterPhaseBegin"); - Countdown countdownTimeNoEntern = new Countdown(timeNoEntern, new FinishNoneEntern()); - countdownTimeNoEntern.startTimer(plugin); + WinconditionTimeout.timeout(); + WinconditionEntern.entern(); } Bukkit.broadcastMessage("§aArena freigegeben!"); } diff --git a/src/me/yaruma/fightsystem/fight/FightManager.java b/src/me/yaruma/fightsystem/fight/FightManager.java index cc16442..6846937 100644 --- a/src/me/yaruma/fightsystem/fight/FightManager.java +++ b/src/me/yaruma/fightsystem/fight/FightManager.java @@ -27,11 +27,11 @@ public class FightManager { } public Location getBlueTeleportLocation() { - return FightSystem.getPlugin().getTeam1SpawnLoc(); + return FightSystem.getPlugin().getTeam2SpawnLoc(); } public Location getRedTeleportLocation() { - return FightSystem.getPlugin().getTeam2SpawnLoc(); + return FightSystem.getPlugin().getTeam1SpawnLoc(); } public Location getBlueTeamPasteLocation() { diff --git a/src/me/yaruma/fightsystem/fight/FightTeam.java b/src/me/yaruma/fightsystem/fight/FightTeam.java index 4d6ff23..1f67fe2 100644 --- a/src/me/yaruma/fightsystem/fight/FightTeam.java +++ b/src/me/yaruma/fightsystem/fight/FightTeam.java @@ -2,9 +2,6 @@ package me.yaruma.fightsystem.fight; import me.yaruma.fightsystem.FightSystem; import me.yaruma.fightsystem.utils.ItemBuilder; -import me.yaruma.fightsystem.utils.WorldEdit; -import me.yaruma.fightsystem.utils.countdown.Countdown; -import me.yaruma.fightsystem.utils.countdown.FinishPreRunning; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/src/me/yaruma/fightsystem/kit/KitManager.java b/src/me/yaruma/fightsystem/kit/KitManager.java index ae1e3ae..66f1b30 100644 --- a/src/me/yaruma/fightsystem/kit/KitManager.java +++ b/src/me/yaruma/fightsystem/kit/KitManager.java @@ -6,7 +6,6 @@ import org.bukkit.inventory.ItemStack; import java.io.File; import java.io.IOException; -import java.nio.file.Path; import java.util.List; public class KitManager { diff --git a/src/me/yaruma/fightsystem/listener/PlayerInteractListener.java b/src/me/yaruma/fightsystem/listener/PlayerInteractListener.java index 6e3cbb7..8377c9d 100644 --- a/src/me/yaruma/fightsystem/listener/PlayerInteractListener.java +++ b/src/me/yaruma/fightsystem/listener/PlayerInteractListener.java @@ -6,14 +6,10 @@ import me.yaruma.fightsystem.fight.FightPlayer; import me.yaruma.fightsystem.fight.FightState; import me.yaruma.fightsystem.fight.FightTeam; import me.yaruma.fightsystem.manager.FileManager; -import me.yaruma.fightsystem.utils.ItemBuilder; -import me.yaruma.fightsystem.utils.WorldEdit; import me.yaruma.fightsystem.utils.countdown.Countdown; import me.yaruma.fightsystem.utils.countdown.FinishNoPlayersOnline; -import me.yaruma.fightsystem.utils.countdown.FinishPreRunning; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java index 6296a3c..45c4c8c 100644 --- a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java +++ b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java @@ -43,6 +43,7 @@ public class PlayerJoinListener implements Listener { player.setGameMode(GameMode.SPECTATOR); player.teleport(instance.getSpecSpawnLoc()); } + return; } FightTeam fightTeam = Fight.getPlayerTeam(player); @@ -51,9 +52,9 @@ public class PlayerJoinListener implements Listener { FightPlayer fightPlayer = fightTeam.getFightPlayer(player); if(instance.getFightState() == FightState.SETUP) { - if(fightTeam == Fight.redTeam) + if(fightTeam == Fight.redTeam) { player.teleport(instance.getFightManager().getRedTeleportLocation()); - else + } else player.teleport(instance.getFightManager().getBlueTeleportLocation()); player.setGameMode(GameMode.ADVENTURE); diff --git a/src/me/yaruma/fightsystem/manager/FileManager.java b/src/me/yaruma/fightsystem/manager/FileManager.java index a0aa5f4..5dd0cef 100644 --- a/src/me/yaruma/fightsystem/manager/FileManager.java +++ b/src/me/yaruma/fightsystem/manager/FileManager.java @@ -63,15 +63,4 @@ public class FileManager e.printStackTrace(); } } - - public Location getLocationFormConfig(String path) { - - World world = Bukkit.getWorld(getStringFromConfig(path + ".world")); - int x = getIntegerFromConfig(path + ".x"); - int y = getIntegerFromConfig(path + ".y"); - int z = getIntegerFromConfig(path + ".z"); - - Location location = new Location(world, x, y, z); - return location; - } } \ No newline at end of file diff --git a/src/me/yaruma/fightsystem/utils/countdown/Countdown.java b/src/me/yaruma/fightsystem/utils/countdown/Countdown.java index 23bfc61..ad45978 100644 --- a/src/me/yaruma/fightsystem/utils/countdown/Countdown.java +++ b/src/me/yaruma/fightsystem/utils/countdown/Countdown.java @@ -19,7 +19,7 @@ public class Countdown { this.countdownCallback = countdownCallback; countdowns.add(this); - if(countdownCallback == new FinishTimeOver()) FightSystem.getPlugin().fightTime = time; + if(countdownCallback instanceof FinishTimeOver) FightSystem.getPlugin().fightTime = time; } @@ -40,6 +40,7 @@ public class Countdown { Bukkit.broadcastMessage("§6Noch §aeine §6Sekunde " + countdownCallback.countdownCounting()); break; case 0: + cancelTimer(); countdownCallback.countdownFinished(); break; } diff --git a/src/me/yaruma/fightsystem/winconditions/WinconditionAllDead.java b/src/me/yaruma/fightsystem/winconditions/WinconditionAllDead.java index fc48a09..00a9c2d 100644 --- a/src/me/yaruma/fightsystem/winconditions/WinconditionAllDead.java +++ b/src/me/yaruma/fightsystem/winconditions/WinconditionAllDead.java @@ -2,7 +2,6 @@ package me.yaruma.fightsystem.winconditions; import me.yaruma.fightsystem.FightSystem; import me.yaruma.fightsystem.fight.Fight; -import me.yaruma.fightsystem.fight.FightPlayer; import me.yaruma.fightsystem.fight.FightTeam; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/me/yaruma/fightsystem/winconditions/WinconditionEntern.java b/src/me/yaruma/fightsystem/winconditions/WinconditionEntern.java new file mode 100644 index 0000000..35930d2 --- /dev/null +++ b/src/me/yaruma/fightsystem/winconditions/WinconditionEntern.java @@ -0,0 +1,22 @@ +package me.yaruma.fightsystem.winconditions; + +import me.yaruma.fightsystem.FightSystem; +import me.yaruma.fightsystem.manager.FileManager; +import me.yaruma.fightsystem.utils.countdown.Countdown; +import me.yaruma.fightsystem.utils.countdown.FinishTimeOver; + +public class WinconditionEntern { + + private static FightSystem instance = FightSystem.getPlugin(); + private static FileManager fileManager = instance.getFileManager(); + + public static void entern() { + if(!Methods.isEnabled("WinConditions.Entern")) return; + + int timeTimeOver = fileManager.getIntegerFromConfig("WinConditionParams.EnterPhaseBegin"); + Countdown countdownTimeOver = new Countdown(timeTimeOver, new FinishTimeOver()); + countdownTimeOver.startTimer(instance); + } + + +} diff --git a/src/me/yaruma/fightsystem/winconditions/WinconditionTimeout.java b/src/me/yaruma/fightsystem/winconditions/WinconditionTimeout.java index 5e81ccb..10a0da4 100644 --- a/src/me/yaruma/fightsystem/winconditions/WinconditionTimeout.java +++ b/src/me/yaruma/fightsystem/winconditions/WinconditionTimeout.java @@ -1,6 +1,22 @@ package me.yaruma.fightsystem.winconditions; +import me.yaruma.fightsystem.FightSystem; +import me.yaruma.fightsystem.manager.FileManager; +import me.yaruma.fightsystem.utils.countdown.Countdown; +import me.yaruma.fightsystem.utils.countdown.FinishTimeOver; + public class WinconditionTimeout { + private static FightSystem instance = FightSystem.getPlugin(); + private static FileManager fileManager = instance.getFileManager(); + + public static void timeout() { + if(!Methods.isEnabled("WinConditions.Timeout")) return; + + int timeTimeOver = fileManager.getIntegerFromConfig("WinConditionParams.TimeoutTime"); + Countdown countdownTimeOver = new Countdown(timeTimeOver, new FinishTimeOver()); + countdownTimeOver.startTimer(instance); + } + }