EpicKnarvik97/HungerArena
EpicKnarvik97/HungerArena
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug in Jeppas code

Browse Source
This commit is contained in:
travja 2013-03-21 17:57:54 -06:00
parent 20f8c66bd6
commit 0f302073f7
12 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/me/Travja/HungerArena/BlockStorage.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/HaCommands$1.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/HaCommands$2.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/HaCommands$3.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/HaCommands$4.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/HaCommands.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/Main$1.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/Main$2.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/Main$3$1.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/Main$3.class
View File

Binary file not shown.

BIN
bin/me/Travja/HungerArena/Main.class
View File

Binary file not shown.

9
src/me/Travja/HungerArena/BlockStorage.java
View File

@ -33,15 +33,16 @@ public class BlockStorage implements Listener {
boolean protall = false; boolean protall = false;
if (plugin.config.getString("Protected_Arena_Always").equalsIgnoreCase("True")) { /* Jeppa Fix/Add */ if (plugin.config.getString("Protected_Arena_Always").equalsIgnoreCase("True")) { /* Jeppa Fix/Add */
protall = true; protall = true;
event.setCancelled(true);
p.sendMessage("You can't break blocks, at all, if you feel this should change, talk to the server owner.");
} }
if ((plugin.getArena(p) != null) || (protall)) { /* Bug1a */ if (plugin.getArena(p) != null || !protall) {
//int a = this.plugin.getArena(p).intValue(); //int a = this.plugin.getArena(p).intValue();
int a = 1; //Jeppa: define a default (may be needed if protall is true) int a = 1; //Jeppa: define a default (may be needed if protall is true)
if (plugin.getArena(p) != null) a = plugin.getArena(p); if (plugin.getArena(p) != null) a = plugin.getArena(p);
if ((!event.isCancelled()) && (((plugin.Playing.get(a)).contains(pname)) || (protall))) /* Bug1a */ if (!event.isCancelled() && plugin.Playing.get(a).contains(pname)){
{
if (plugin.config.getString("Protected_Arena").equalsIgnoreCase("True")) { if (plugin.config.getString("Protected_Arena").equalsIgnoreCase("True")) {
event.setCancelled(true); /* Jeppa fix Bug1 */ event.setCancelled(true);
p.sendMessage(ChatColor.RED + "You can't break blocks while playing!"); p.sendMessage(ChatColor.RED + "You can't break blocks while playing!");
} else if ((((plugin.canjoin.get(a))) || (protall)) && ((plugin.config.getStringList("worlds").isEmpty()) || ((!plugin.config.getStringList("worlds").isEmpty()) && (plugin.config.getStringList("worlds").contains(p.getWorld().getName()))))) { } else if ((((plugin.canjoin.get(a))) || (protall)) && ((plugin.config.getStringList("worlds").isEmpty()) || ((!plugin.config.getStringList("worlds").isEmpty()) && (plugin.config.getStringList("worlds").contains(p.getWorld().getName()))))) {
if (((plugin.management.getIntegerList("blocks.whitelist").isEmpty()) || ((!plugin.management.getIntegerList("blocks.whitelist").isEmpty()) && (!plugin.management.getIntegerList("blocks.whitelist").contains(Integer.valueOf(b.getTypeId()))))) ^ (plugin.management.getBoolean("blocks.useWhitelistAsBlacklist"))) { if (((plugin.management.getIntegerList("blocks.whitelist").isEmpty()) || ((!plugin.management.getIntegerList("blocks.whitelist").isEmpty()) && (!plugin.management.getIntegerList("blocks.whitelist").contains(Integer.valueOf(b.getTypeId()))))) ^ (plugin.management.getBoolean("blocks.useWhitelistAsBlacklist"))) {