From 20159ae0287b648235a0acc9f2d0fa7a8d950061 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Thu, 7 Feb 2013 23:48:05 -0800 Subject: [PATCH] fix all the errors. --- lib/Xperms.jar | Bin 0 -> 19033 bytes pom.xml | 9 +- src/net/milkbowl/vault/Vault.java | 4 + .../permission/plugins/Permission_Xperms.java | 150 +++++++++--------- 4 files changed, 84 insertions(+), 79 deletions(-) create mode 100644 lib/Xperms.jar diff --git a/lib/Xperms.jar b/lib/Xperms.jar new file mode 100644 index 0000000000000000000000000000000000000000..7e488f8d7dce2c80397b325873a439621e80ed82 GIT binary patch literal 19033 zcmagFV{~WDzAc=N?WAMdwr$(CZQHhOJL%ZAZ72UYopf^hIs3lv+53Drca2q}KCBv5 z^{c8;bFNvl6r@2wQGp;KA%Pm(#D#$V?Lh?s1(Fq25u}xr6Qh?El#>(_RaT*s75kb5 z0(z94o|2KKrCWfLrlp#lo@-WOSZ3ZoIXnRdQjms#Z1M-b#r|6r=HI07|2NPbEc_o0 zApHI6VCrOR>FjK2Z|6+sX={@k&j=07h$!kU&zKqrMoYU0)pqzJNR$NycU^W+X3)#W z*v%Flv^D#iuV-$XBaOrh%t63jI$xhWAREMlZe7CY>1n=Tb#?kivsElAADcfggeL)V zgdo`#gd&JA`NlLmx%M6-SI>jKY|uY9^=3!Fkn&en7{4Xub|Ph8s<6vAoA{SebM-k3 z`0>f{EX(H*d6lyKKN00nQplwK?Qg`7e~+m7e?$cRw}i31otdTiKf#bj4?qVqAd1}i zjR@5L2I)lO(Sm+~0q$PdC(~x5{OTp+o$(%;2C1Hd7)EInG^#WW*`$?$EQ2Z{PlvW{ zu3A58+q(_>F75d7_V$FP=e6K7I6d%P;^s&B?4uObx%4q@^YfpsQNnj58UJnA>u>t+ z!4|Ij&)NK^YYsN9=9YH!QQErF_nnX&^kiaA<7%BDxTA>Dfc<;p@x3z`~e;BdiSP7R$-p<5t2o z!3U)u3&w-+osjSrnIZ>gOmV3JGZlG2UlmsPP;5?&J89JfTFQAxP4eB_%tsQeNwx^H zO!&<4GUl07+}3u;b_iF#b=qYs-F{ zWMKT>AO8&3Oe&kg>)*l1`Hz{5`yY#+=5GmOds}*QOBV}QBYJ03BV%?ZCVGv3)~oZs zvj1<{8rv8;JC~|kx}dC~edUo@+j!ap2d@J|Wyq$PP-6fOn=z9F46wPug6AZ-(I7ko z&_L0mw!=wkmuq*mTf*orfw|jT1XncAx5#F*T_oLp>^gh>?*6l~MDk}hTM#BqmV=Wo z&(rI!x7%m$*Xu9Omyt0#5RLFYYX_*BII=M!Mr!UX>^PI@gY(h0w(*0MOuVUedg|oH zq{tZX`2L)uQA%QDcI3wKuY)5q7V3R2Ub2QBZ*)@Qu+($J`^`Quba(Ql#&L(+VJK>B z$q{EpYNQKgddk)fDUFRkDc>8qlT{N)9;%hB8~OHUd+FUB)CPD*5U*JIw2}sl-q!#ne|+4TY~jT4)eEJhFBy zEyNTE$WBk=&6-ZL2x=i&&u7`9khWbOo@t{@H20&~IPlzi=6n9z+-Re

73+$N|F8l} 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 sa}oU org.bukkit craftbukkit - 1.4.7-R0.1 + 1.4.7-R1.0 de.hydrox.bukkit.DroxPerms @@ -74,6 +74,13 @@ system ${project.basedir}/lib/bpermissions.jar + + com.github.sebc722 + xPerms + 1.1 + system + ${project.basedir}/lib/Xperms.jar + ca.agnate.EconXP.EconXP EconXP diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java index 29e1064..66ad476 100644 --- a/src/net/milkbowl/vault/Vault.java +++ b/src/net/milkbowl/vault/Vault.java @@ -68,6 +68,7 @@ import net.milkbowl.vault.permission.plugins.Permission_Privileges; import net.milkbowl.vault.permission.plugins.Permission_SimplyPerms; import net.milkbowl.vault.permission.plugins.Permission_Starburst; import net.milkbowl.vault.permission.plugins.Permission_SuperPerms; +import net.milkbowl.vault.permission.plugins.Permission_Xperms; import net.milkbowl.vault.permission.plugins.Permission_bPermissions; import net.milkbowl.vault.permission.plugins.Permission_bPermissions2; import net.milkbowl.vault.permission.plugins.Permission_zPermissions; @@ -302,6 +303,9 @@ public class Vault extends JavaPlugin { // Try to load Permissions 3 (Yeti) hookPermission("Permissions 3 (Yeti)", Permission_Permissions3.class, ServicePriority.Normal, "com.nijiko.permissions.ModularControl"); + + // Try to load Xperms + hookPermission("Xperms", Permission_Xperms.class, ServicePriority.Low, "com.github.sebc722.Xperms"); Permission perms = new Permission_SuperPerms(this); sm.register(Permission.class, perms, this, ServicePriority.Lowest); diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java b/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java index 86c94ec..fc48a53 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java @@ -32,155 +32,149 @@ import org.bukkit.plugin.Plugin; public class Permission_Xperms extends Permission { private final String name = "Xperms"; - private Xmain permission = null; + private Xmain perms = null; public Permission_Xperms(Plugin plugin) { - this.plugin = plugin; - Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(), plugin) - - if(permission == null){ - Plugin perms = plugin.getServer().getPluginManager().getPlugin("Xperms"); - if(perms != null){ - if(perms.isEnabled()){ - try{ - if(Double.valueOf(perms.getDescription().getVersion()) < 1.1){ - log.info(String.format("[%s] [Permission] %s Current version is not compatible with vault! Please Update!", plugin.getDescription().getName(), name)); - } - } catch(NumberFormatException e){ - // version is first release, numbered 1.0.0 - log.info(String.format("[%s] [Permission] %s Current version is not compatibe with vault! Please Update!", plugin.getDescription().getName(), name); - } - } - permission = (Xmain) perms; + this.plugin = plugin; + Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin); + + if(perms == null){ + Plugin perms = plugin.getServer().getPluginManager().getPlugin("Xperms"); + if(perms != null){ + if(perms.isEnabled()){ + try{ + if(Double.valueOf(perms.getDescription().getVersion()) < 1.1){ + log.info(String.format("[%s] [Permission] %s Current version is not compatible with vault! Please Update!", plugin.getDescription().getName(), name)); + } + } catch(NumberFormatException e){ + // version is first release, numbered 1.0.0 + log.info(String.format("[%s] [Permission] %s Current version is not compatibe with vault! Please Update!", plugin.getDescription().getName(), name)); + } + } + perms = (Xmain) perms; log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); - } - } + } + } } public class PermissionServerListener implements Listener { - Xmain permission = null; - - public PermissionServerListener(Permission_Xperms permission){ - this.permission = permission; - } - - @EventHandler(priority = EventPriority.MONITOR) - public void onPluginEnable(PluginEnableEvent event) { - this.plugin = plugin; - Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(), plugin) - - if(permission == null){ - Plugin perms = plugin.getServer().getPluginManager().getPlugin("Xperms"); - if(perms != null){ - if(perms.isEnabled()){ - try{ - if(Double.valueOf(perms.getDescription().getVersion()) < 1.1){ - log.info(String.format("[%s] [Permission] %s Current version is not compatible with vault! Please Update!", plugin.getDescription().getName(), name)); - } - } catch(NumberFormatException e){ - // version is first release, numbered 1.0.0 - log.info(String.format("[%s] [Permission] %s Current version is not compatibe with vault! Please Update!", plugin.getDescription().getName(), name); - } - } - permission.permission = (Xmain) perms; - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); - } - } + Permission_Xperms permission = null; + + public PermissionServerListener(Permission_Xperms permission) { + this.permission = permission; } + @EventHandler(priority = EventPriority.MONITOR) + public void onPluginEnable(PluginEnableEvent event) { + if (event.getPlugin().getDescription().getName().equals("Xperms")) { + Plugin perms = event.getPlugin(); + try { + if(Double.valueOf(perms.getDescription().getVersion()) < 1.1){ + log.info(String.format("[%s] [Permission] %s Current version is not compatible with vault! Please Update!", plugin.getDescription().getName(), name)); + } + } catch(NumberFormatException e){ + // version is first release, numbered 1.0.0 + log.info(String.format("[%s] [Permission] %s Current version is not compatibe with vault! Please Update!", plugin.getDescription().getName(), name)); + } + permission.perms = (Xmain) perms; + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); + } + } + + @EventHandler(priority = EventPriority.MONITOR) public void onPluginDisable(PluginDisableEvent event) { - if(permission.permission != null){ - if(event.getPlugin().getName().equals("Xperms")){ - permission.permission = null; + if(permission.perms != null){ + if(event.getPlugin().getName().equals("Xperms")){ + permission.perms = null; log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), permission.name)); - } - } + } + } } } @Override public String getName() { - return name; + return name; } @Override public boolean isEnabled() { - return permission.isEnabled(); + return perms.isEnabled(); } @Override public boolean hasSuperPermsCompat() { - return true; + return true; } @Override public boolean playerHas(String world, String player, String permission) { - return permission.getXplayer().hasPermission(player, permission); + return perms.getXplayer().hasPermission(player, permission); } @Override public boolean playerAdd(String world, String player, String permission) { - return permission.getXplayer().addPermission(player, permission); + return perms.getXplayer().addPermission(player, permission); } @Override public boolean playerRemove(String world, String player, String permission) { - return permission.getXplayer().removePermission(player, permission); + return perms.getXplayer().removePermission(player, permission); } @Override public boolean groupHas(String world, String group, String permission) { - return permission.getXgroup().hasPermission(group, permission); + return perms.getXgroup().hasPermission(group, permission); } @Override public boolean groupAdd(String world, String group, String permission) { - return permission.getXgroup().addPermission(group, permission); + return perms.getXgroup().addPermission(group, permission); } @Override public boolean groupRemove(String world, String group, String permission) { - return permission.getXgroup().removePermission(group, permission) + return perms.getXgroup().removePermission(group, permission); } @Override public boolean playerInGroup(String world, String player, String group) { - String userGroup = permission.getXusers().getUserGroup(player); - if(userGroup == group){ - return true; - } - else{ - return false; - } + String userGroup = perms.getXusers().getUserGroup(player); + if(userGroup == group){ + return true; + } + else{ + return false; + } } @Override public boolean playerAddGroup(String world, String player, String group) { - return permission.getXplayer().setGroup(player, group); + return perms.getXplayer().setGroup(player, group); } @Override public boolean playerRemoveGroup(String world, String player, String group) { - return permission.getXplayer().setGroup(player, "def"); + return perms.getXplayer().setGroup(player, "def"); } @Override public String[] getPlayerGroups(String world, String player) { - ArrayList playerGroup = new ArrayList(); - playerGroup.add(permission.getXusers().getUserGroup(player)); - String[] playerGroupArray = playerGroup.toArray(new String[0]); - - return playerGroupArray; + ArrayList playerGroup = new ArrayList(); + playerGroup.add(perms.getXusers().getUserGroup(player)); + String[] playerGroupArray = playerGroup.toArray(new String[0]); + + return playerGroupArray; } @Override public String getPrimaryGroup(String world, String player) { - return permission.getXusers().getUserGroup(player); + return perms.getXusers().getUserGroup(player); } @Override public String[] getGroups() { - return permission.getXperms().getGroups(); + return perms.getXperms().getGroups(); } } \ No newline at end of file