From ef30ff91b5e3a7f0f8fc9c6c10375b02a486d6d8 Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Thu, 7 Mar 2013 15:33:56 -0600 Subject: [PATCH] 2.0.0 :D --- .../commands/VaultOperations.class | Bin 4048 -> 4048 bytes .../playervaults/util/VaultManager.class | Bin 4576 -> 4454 bytes .../commands/VaultOperations.java | 6 +++--- .../playervaults/util/VaultManager.java | 18 ++++++++---------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/bin/com/drtshock/playervaults/commands/VaultOperations.class b/bin/com/drtshock/playervaults/commands/VaultOperations.class index bf9f4506756c982cdd8283a3ea25f564bc773446..59ee62415ab61c130ca454126e1618ae2f9e7af2 100644 GIT binary patch delta 33 pcmca0e?fjj0uNWFj!@J#hM1WQDU;XnX-%HOQ^DxAnV0u469C5h3labT delta 24 gcmca0e?fjj0uN*E!U)txL*@Xd?Vt)L7Gv9vmeedzS&wKFx2XDU% z;2{33p-iDAVNXYs87F($PE18-QpQy?Gi&5hPBxlztWm@qRM0t#Cujaeg_ zGSU;#(_@on!cnN0N#!Q2v_eDQ`qKIhD;-k^I+l|%6>9pHgs}yiE3qB5 z8g?jbw=)ybvE0;@Re2O-Kpa)+)c}k znHe*kRM^+(bJ7DV*5upr{4SUi3*jCGH7b%CMAE&h1QbwOUx4_sTgOMl;^6s{@uA)j z_9*CQ+@QLF%!bfNB^N_zRw(Og5M`}8_F+GrbZk!rv1nYYB~}TA13EN>LbzW+^Malg z5$%HcA%z`&hl}M0k4ARFNDUhqOMVwN1I}eDOZ5H^Z`N>|>W=Fe1`-WDQ2x*wup4BmkA!6(0zU#Dv zN1?Y=H2qj4?DV)bkz?>^Qgob`q9ew1s>i=gS`&((8&#po1)=tc!rhJWwFVVaA&gO6 z)bNBt)R%3yqfW<@xWweonygEEOE}<*RWT!n1qMUM7!rh3BJcTsqSW;dX-`auP)^cF zarE6SMI*P6O8w;`?UJ0S8h4%HR^Te3RcP}|xgA8Ltfp)uSzz;l6+9u8E$3>~s}QAm zEU~b4%-~}bG+{c$8nLGYI%^}!@G}!NS9!zkFmjmFKrnn=#1p9F3Rv~EStFG*PmfD2 zDM1j{*^lFs8a|=0)rV%cTefw43Qv>BiHvDD=2ChpjIQvx1oS6uX$Y~nj~vD7<%he( z%~%zl!Lu4ZqfqBFXa%l1K8w#OY_i!Ed{&WOz8j@vH*IiW*fQscNFTnS7ZjIruvPULOrfZ znkmyM*3-i){ASggHqyyxkM|yQm9NLd9KNCBo6@YR9J|k+Gc!Fbf5NJ73xB?&u!5Dv z1YaB05ME+N?Y}ym3bQ%23&+2wTS+KteyHO|_%X3F zuUJ`!X~7ZY@i4ASsr%`MrA`oDVO9t?n32Z?T24<5(*0l6G4FQ&N6z;44utSa7LbN2 z{2H%m_zf$NFZd;K*YUcv@hYJ}znRT)=o9_x5!`^MF84MKg-T0uT~70b8<6`IR2{RZ!$hs&u}JXu_KX(GKS0q72^fUEB@HAWSOs- zQ`soqU``C$xlE$aMYg)NuP{OHmyE={>^J3{!OQvPT*DP)tm3mqCLX>k_$7=gK6U=e zBY-l#C!23#Q}a96GIA3&3)q%Nq-JLx^$XY~%lq7=ySsOJw~5Ok3AK;#bW%T1S`8)8a@VkH?!^ zBf&gAx@=D^tpM($ggw}Vy_|L%(Sjz|j-#I3B|BParAfWig>m947`9>pmx;XGx40Le zlzLh`MY#$oOnaECo%|w^nDp!mL;|br%Ol+tZ0V|q1mDA>1kodQgFNbJt2TqZ>=WrMo@Bl7x zdbV)H_4^63Mo?eI|2aJG`aOv+7yOLpSYJNrm3;4OP{})^qm~#uiDg(i$ zsD&G-UwtX>X?0Jn2K^y|@GxONMtHmV*F&(6<5?2=IgHI3e64IaaJY52Po+lPv z(C2Zh0Q&qA*{9Zis*9FhYR%FqvK`#Qtv`g&bvYU z9seLKm#EESrGQb7^8cVtL+5`<^neCc#HCY~aVd_R)mO8RgIJKFfVK|-M=ODNf4RDB rrX9dVR+J}kfL4h|&7RODkJ{W&N>yod>qZ$*R}?%__$T+v@UQ;?8McNJ literal 4576 zcmb7Hi(eGi89f(vca~)oTt!)VXcX*U{D?w2#TgP!|nhB%g%Op7R5f2 zwCOXgeWh(o-;dNb^kHmVFlp0w)298C`b&H6%|gzNh=%4Sw=E4DaXTFN}JU)3OoXh^V*UY zNouLt$msOE9=8O1>11x!NC~tK-P_u*W~8D5UdynOxg+P3yd1zQAmtasFxGm;5C|>_H22(9&r= zl@K^s&18j_LSRup_R`B)yB0S7SwHsCno}3);9(W}aX`RtnGSdY+uGVI3`Xl9(5|8m zemUw;;e}72VaQ17Be}(CJu{(AJJm4bT5?j$81lI=>9OXFEMxya@K;cTMf4k~tfi&m zEOK2|Thi?e1bW(r%*(&q^D$|BZI|Jv@-lbS=m7UmAIa^3^SEga718h z5&pr^(whJt#bXMN3UuC^fp)OtI&(}KS2bx+MK5H;mf5Fe^`35l?hT`?f^vY^eo)16 zJWgz#7P6C;{1E7`T6-53aWgez%;v}*h7_6MqR5oCn2fon$%zwe9-9G@05Qq1lLEWi z1}g(9@+g1-JgMN6K;%B%sTjm*_E1)5dmpHhfU8!H3Pjr{B@9C#DPtU@Y?2FzK|2{vd6o&SK$qLf`ziq0oHVsWfz5}@ctR>0 z)^fz@*y=o%wYZ?-BA%w9S=}nO?fxq0R8}-9YreS-m!K(lhRyE6AU3C2F*9jqR7@jI z=ue&)J9BBQpX}J~&a(8KZH&UT2Q%xGsaQ%^b)7hijPhfSnrUOux-WovBo!=_?Fr8J zDi*>0Kv~j~IenCFnyT@XfuzA*<)Z>yTnY8r5}_gslCL42(KSmisf57AGU%%?;7L=; zdvvfOi)gzWk18vp^;p6c1(yYyT>+JqSH&`}3T!f|?5?QDa@UG#wl{J97N`+<#;%>~x1$mJkKdH)lgemyUWljq6Ehmc~rSEiJw< ztfdRvLVZF{>Q+(KkCx?4@mE!;e)c@cZ#o>eorh03O*|r6T=I#SN)D-cw`!{Ud(-f^yqh zj}`n%!7r)TWuB_gL&dMlP^w z#l6*6t&!x`+baGbx#eA4;E7ny{7J>1<;*5W4oCFM(rWgON!k@Shx5D=EwP(#B!=@& ze4dbJeSCRL^?EyceIf5VI1=(T_Q(%b@!?zeNFIscEK%IO2Eze!4Q8(r@`aQ;$kpK7 z4QvZ}*YGj-oXoM-#yQNYfygODZVyr0izAG-2WPksJ%yu;@iDe|FAN;B^M0E3W~8OO z=kY9_v-6(E^M$G~aq@e~|b*M@-Jpv&2lH{o?2a+HOG2dpNIP zK*79%rA8Y63_iQQwBkICNzhhU)6ex1vF0fWO85=5t>KF-t*q&;;FldtR`C^C_ceS~ zf|$ok*Kt1NtAzPwqNE6M2j8znN5S5Y9DBi^(9|uwDgpmFhXv}~!D}@j+BEu`8)#X- z=(mo4`>VUCA7ZBfj}wI_$nF#5ZXa=u5sj0WLO)($TfT@>xJI;IBT|z2V@|pyS6PiW>GLe2cniNH@+G{l*VbF8oIh+RK8x{gI>$^pfX!{N9S>{hF|*%840}0`5OG|e{_ws AZ2$lO diff --git a/src/com/drtshock/playervaults/commands/VaultOperations.java b/src/com/drtshock/playervaults/commands/VaultOperations.java index 9e7bae7..325bce5 100644 --- a/src/com/drtshock/playervaults/commands/VaultOperations.java +++ b/src/com/drtshock/playervaults/commands/VaultOperations.java @@ -65,9 +65,9 @@ public class VaultOperations { sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); return true; } - else { - Feedback.noPerms(sender); - } + } + else { + Feedback.noPerms(sender); } return false; } diff --git a/src/com/drtshock/playervaults/util/VaultManager.java b/src/com/drtshock/playervaults/util/VaultManager.java index 1120c8e..11c4a77 100644 --- a/src/com/drtshock/playervaults/util/VaultManager.java +++ b/src/com/drtshock/playervaults/util/VaultManager.java @@ -7,7 +7,6 @@ import java.io.IOException; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; @@ -22,7 +21,9 @@ public class VaultManager { this.plugin = instance; } - String title; + String title = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + + ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; + private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults"; /** @@ -33,7 +34,6 @@ public class VaultManager { * @throws IOException */ public void saveVault(Inventory inv, String player, int number) throws IOException { - // Get the player's file and serialize the inventory. String ser = Serialization.toBase64(inv); YamlConfiguration yaml = playerVaultFile(player); yaml.set("vault" + number + "", ser); @@ -48,10 +48,10 @@ public class VaultManager { */ public void loadVault(Player sender, String holder, int number) { YamlConfiguration playerFile = playerVaultFile(holder); - String data = playerFile.getString("vault"+number); + String data = playerFile.getString("vault" + number); Player player = (Player) sender; if(data == null) { - Inventory inv = Bukkit.createInventory(player, 54, ChatColor.DARK_RED + "Vault #"+String.valueOf(number)); + Inventory inv = Bukkit.createInventory(player, 54, ChatColor.DARK_RED + "Vault #" + String.valueOf(number)); player.openInventory(inv); } else { Inventory inv = Serialization.fromBase64(data); @@ -61,15 +61,13 @@ public class VaultManager { public void deleteVault(CommandSender sender, String target, int number) throws IOException { String name = target.toLowerCase(); - File file = new File(directory + name + ".yml"); + File file = new File(directory + File.separator + name.toLowerCase() + ".yml"); FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file); if(file.exists()) { - ConfigurationSection section = playerFile.getConfigurationSection("vault" + number); - section.set(null, null); + playerFile.set("vault" + number, null); sender.sendMessage(title + "Deleting " + ChatColor.GREEN + " " + number); playerFile.save(file); - } - else { + } else { sender.sendMessage(title + " That doesn't exist!"); } }