From 37b012ffe1a7a91c51775d70cc85c2224d475c61 Mon Sep 17 00:00:00 2001 From: Savvy Date: Tue, 15 Aug 2017 23:56:17 -0400 Subject: [PATCH] Fixed tiny bug with permissions --- .../2.13/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .gradle/2.13/taskArtifacts/fileHashes.bin | Bin 42195 -> 42195 bytes .gradle/2.13/taskArtifacts/fileSnapshots.bin | Bin 1040007 -> 1040007 bytes .gradle/2.13/taskArtifacts/taskArtifacts.bin | Bin 35285 -> 35285 bytes .idea/workspace.xml | 136 +++++++----------- .../java/me/savvy/rixa/guild/RixaGuild.java | 7 +- 6 files changed, 58 insertions(+), 85 deletions(-) diff --git a/.gradle/2.13/taskArtifacts/cache.properties.lock b/.gradle/2.13/taskArtifacts/cache.properties.lock index cae8b1714bf3ad2ff59edf6b0644930e43e670a9..ec7cd3f604b001abeec3f0f771a439e865e575fb 100644 GIT binary patch literal 17 UcmZRM`)gkj_?x4T0Sp{N05duSjQ{`u literal 17 VcmZRM`)gkj_?x4T0Sp|z0{}DI1up;q diff --git a/.gradle/2.13/taskArtifacts/fileHashes.bin b/.gradle/2.13/taskArtifacts/fileHashes.bin index 91b68317ae4c9ecfcf807f0cddfd7bb9c674e4a1..a102e255fd51e98162f67ed80e2ce26d0da77a6e 100644 GIT binary patch delta 1098 zcmXYvZAg<*6vwwYYm}C+IW=5r25L~~giOSuuynpsX^K)N5>y{FUxxXpivqf!bM4b2`?SayUm{+f z?_J?fmfR7#EzcVk1oY>T4XbK@aNP7Ea(^8NOQVT8P|H-$PteRs;bN(RG);w0B$76# zN)Z`Uz#>I@4quY}Af^n}#~YAZhJkz*Q^j(s9#MF^<`cLLEKF80*>ws`sZ#JN zNBHR(h$z2KilKC9E04ya5#F-S5+qdUNUr`h1BI6h20~{wo;~)0(R7^8#nv?#nh>ojmRm}A|5!|5`Zt4SgB zL_VXvfzk=JNKXbpPA$@tiO|f7M%a}RjWJ_OAXMQevV|~G)Q7FBUh4y_gRY z`U-?~Gf`wXDYUD7NJ8H%ONjqPCw`;Gi3h%dLmflZXK_sRNklay*dzQOcWg7pyy@Oy zc&Uk$X4B;NUV3JemeJvFwOB~V!wraS#kC(9p`;aeH2q{YcNh8&UbR|C)0W4Yk_tLN zk0zZo^_{HgHb_VHYr9Kwo@c@RwvVJ33?) zp&qJqxZLQHh?K`(0;f}w>bQ$l1HV9Fy$tenYLc`zyOCI$ zoYWy=U4>e@d93U;3B&0! zI986ZtrpIf7h^C1o#jdlmf#c3*bjlK!c2TeXBo)drJ%SHL3x!X1RXi>z6SMrX^S z1&E(6Nvn5m&+yKToR~MRYaSjP*~+oTV8tJ7_9{aHf?Q0qBA~k#y9=Joz~2`Nv!$?G8;sf{@T*Hen|^R*T)^iO20>qkKEg*hmnnz&x-_JJ zFj@kXR@EczJO!G1q@5~gWq}$FXDO+TKX46rBZ98sg9bz&+Px>89wL3`Cxy_P36}0_8M<&iR z!IHis)G(y;8SxPm(9^j{0_!a3jd&_oxSI{3%P$!5$y^!ycVn!GM7EOoi^|5Okl%+rtoNAAtB78i@57JAp30Km3fdy3pSFnRFZHWA>|ueX Hf$RSPmob!= diff --git a/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 64a422e02d2b0ae44cf799e09dac44abbec18b95..9e4e20d14452199ac3e45268aa128ad96dd4613d 100644 GIT binary patch delta 535 zcmZqQYu~=teuA_xW0p4q1A_z*GcYi%?PXxFXrHJj$K<52(N9T2p!>1eW)SHnx3Khln$NJ2F{7Qem=(q=&#! z?rGPGh1*_&HL!-qZtjqDV4VCwN{UeOeV&A(-6A&{4G0S!yL)J(&Hiqp$d$&*1W?U*I$S`*;?|to6iZ4Y?UdBjz$f<#y#K3TL z`oWuwuG1Z^un2E2h-3aM++Lr<3dC$c%nrmH+v{^Ur^s&Kw~|XxSx`XpPmRSd(;dHf zXRkRnLt7$z`@=I_8+f*7yYMs#F@{bzYqkDOw*ZG8xI6#= delta 484 zcmZqQYu~=teuA_x!ybMH1_lWrW?*3ac7%b!Zv8|(Ii@b|jebfJlRG3NChw3)5LoK! z<8VQ3^9zWwEbqwzk_wYOBqapapWmqRLwhw)9}sXlDNK%#4A^`?(t=Uo+oDsi^W6`> z1Iw_6$4>qrr7&4Txh&A!8qggRA#E|) zL&iWrfAfnZUdab4U>)j+f;-6A&{4G0S!y zL)J*O?PtC*N{P1D=dc1X8xXStF~|1$9L_1S9In71a+P3e-F{G%Pmggr(2~X5d!<-d zn6}IO<49o!+czC(pTPD%o}4>*L6-J0ZWpNJd(1Tb?kg6d?S3MhqCkBHKo`cvan@^Y zw>Zz)c5AzE7pI`|_P_7AdHDqe{BNIjXFuU7JCXlX-P2p^cT5-TWIH>3!fCdp+xz}= yZ{}kRo!M>B53M)!Pp~WmjctZ~e#x#N0s41H`=BTR-wKy#)YdYo==e diff --git a/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/.gradle/2.13/taskArtifacts/taskArtifacts.bin index 93d27771b0f9c7f78064df5f8006eaa96d2a1e26..3bddf350549f5b4de8e00b616eb30c8eb5cba430 100644 GIT binary patch delta 88 zcmV-e0H^=elLFO~07Evw?HB1G5}^o(HpuhD-zeyC-b` delta 88 zcmV-e0H^=elLFO~0^mZ%wP7XIKF8#MwcaG80x3d - - + + @@ -54,7 +54,7 @@ - + @@ -64,14 +64,13 @@ - + - - + + - @@ -84,6 +83,23 @@ + + + + + + + + + + + + + + + + + @@ -604,13 +620,13 @@ @@ -623,10 +639,9 @@ - - @@ -1378,10 +1379,6 @@ - - - - @@ -1389,11 +1386,6 @@ - - - - - @@ -1417,10 +1409,6 @@ - - - - @@ -1475,7 +1463,6 @@ - @@ -1483,9 +1470,6 @@ - - - @@ -1493,33 +1477,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1570,21 +1527,20 @@ - - - + + - + @@ -1595,11 +1551,10 @@ - - + + - @@ -1611,6 +1566,21 @@ + + + + + + + + + + + + + + + diff --git a/src/main/java/me/savvy/rixa/guild/RixaGuild.java b/src/main/java/me/savvy/rixa/guild/RixaGuild.java index 2282ecc..dc90dea 100644 --- a/src/main/java/me/savvy/rixa/guild/RixaGuild.java +++ b/src/main/java/me/savvy/rixa/guild/RixaGuild.java @@ -86,19 +86,22 @@ public class RixaGuild { if(!permissionExists(role)) { return false; } + + boolean b = false; try { PreparedStatement ps = db.getConnection().prepareStatement ("SELECT `" + permission.toString().toUpperCase() + "` FROM `permissions` WHERE `role_id` = ?"); ps.setString(1, role.getId()); ResultSet rs = db.getObject(ps); + + b = rs.getBoolean(permission.toString().toUpperCase()); ps.close(); rs.close(); - return rs.getBoolean(permission.toString().toUpperCase()); } catch (SQLException e) { e.printStackTrace(); } - return false; + return b; } public void setPermission(Role role, RixaPermission permission, boolean value) {