Skip to content

Commit 2267cda

Browse files
committed
split 3 bug types with outside method code changes from all, i.e., exclude withinsinglemethod
1 parent 94facb8 commit 2267cda

1,012 files changed

Lines changed: 87354 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

All/.DS_Store

0 Bytes
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Declaration redundancy
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
diff --git a/src/net/slipcor/pvparena/commands/PAA_Edit.java b/src/net/slipcor/pvparena/commands/PAA_Edit.java
2+
index 85f6171f..8e4000f2 100644
3+
--- a/src/net/slipcor/pvparena/commands/PAA_Edit.java
4+
+++ b/src/net/slipcor/pvparena/commands/PAA_Edit.java
5+
@@ -26 +26 @@ public class PAA_Edit extends AbstractArenaCommand {
6+
- public static Map<String, Arena> activeEdits = new HashMap<String, Arena>();
7+
+ public static final Map<String, Arena> activeEdits = new HashMap<String, Arena>();
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
package net.slipcor.pvparena.commands;
2+
3+
import net.slipcor.pvparena.arena.Arena;
4+
import net.slipcor.pvparena.core.Help;
5+
import net.slipcor.pvparena.core.Help.HELP;
6+
import net.slipcor.pvparena.core.Language;
7+
import net.slipcor.pvparena.core.Language.MSG;
8+
import org.bukkit.command.CommandSender;
9+
10+
import java.util.Arrays;
11+
import java.util.HashMap;
12+
import java.util.List;
13+
import java.util.Map;
14+
15+
/**
16+
* <pre>PVP Arena EDIT Command class</pre>
17+
* <p/>
18+
* A command to toggle an arena's edit mode
19+
*
20+
* @author slipcor
21+
* @version v0.10.0
22+
*/
23+
24+
public class PAA_Edit extends AbstractArenaCommand {
25+
26+
public static final Map<String, Arena> activeEdits = new HashMap<String, Arena>();
27+
28+
public PAA_Edit() {
29+
super(new String[]{"pvparena.cmd.edit"});
30+
}
31+
32+
@Override
33+
public void commit(final Arena arena, final CommandSender sender, final String[] args) {
34+
if (!this.hasPerms(sender, arena)) {
35+
return;
36+
}
37+
38+
if (!argCountValid(sender, arena, args, new Integer[]{0})) {
39+
return;
40+
}
41+
42+
String msg;
43+
44+
if (PAA_Edit.activeEdits.containsValue(arena)) {
45+
activeEdits.remove(sender.getName());
46+
msg = Language.parse(arena, MSG.ARENA_EDIT_DISABLED, arena.getName());
47+
} else {
48+
if (arena.isFightInProgress()) {
49+
final PAA_Stop cmd = new PAA_Stop();
50+
cmd.commit(arena, sender, new String[0]);
51+
}
52+
activeEdits.put(sender.getName(), arena);
53+
msg = Language.parse(arena, MSG.ARENA_EDIT_ENABLED, arena.getName());
54+
}
55+
arena.msg(sender, msg);
56+
}
57+
58+
@Override
59+
public String getName() {
60+
return this.getClass().getName();
61+
}
62+
63+
@Override
64+
public void displayHelp(final CommandSender sender) {
65+
Arena.pmsg(sender, Help.parse(HELP.EDIT));
66+
}
67+
68+
@Override
69+
public List<String> getMain() {
70+
return Arrays.asList("edit");
71+
}
72+
73+
@Override
74+
public List<String> getShort() {
75+
return Arrays.asList("!e");
76+
}
77+
78+
@Override
79+
public CommandTree<String> getSubs(final Arena arena) {
80+
return new CommandTree<String>(null);
81+
}
82+
}
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
package net.slipcor.pvparena.commands;
2+
3+
import net.slipcor.pvparena.arena.Arena;
4+
import net.slipcor.pvparena.core.Help;
5+
import net.slipcor.pvparena.core.Help.HELP;
6+
import net.slipcor.pvparena.core.Language;
7+
import net.slipcor.pvparena.core.Language.MSG;
8+
import org.bukkit.command.CommandSender;
9+
10+
import java.util.Arrays;
11+
import java.util.HashMap;
12+
import java.util.List;
13+
import java.util.Map;
14+
15+
/**
16+
* <pre>PVP Arena EDIT Command class</pre>
17+
* <p/>
18+
* A command to toggle an arena's edit mode
19+
*
20+
* @author slipcor
21+
* @version v0.10.0
22+
*/
23+
24+
public class PAA_Edit extends AbstractArenaCommand {
25+
26+
public static Map<String, Arena> activeEdits = new HashMap<String, Arena>();
27+
28+
public PAA_Edit() {
29+
super(new String[]{"pvparena.cmd.edit"});
30+
}
31+
32+
@Override
33+
public void commit(final Arena arena, final CommandSender sender, final String[] args) {
34+
if (!this.hasPerms(sender, arena)) {
35+
return;
36+
}
37+
38+
if (!argCountValid(sender, arena, args, new Integer[]{0})) {
39+
return;
40+
}
41+
42+
String msg;
43+
44+
if (PAA_Edit.activeEdits.containsValue(arena)) {
45+
activeEdits.remove(sender.getName());
46+
msg = Language.parse(arena, MSG.ARENA_EDIT_DISABLED, arena.getName());
47+
} else {
48+
if (arena.isFightInProgress()) {
49+
final PAA_Stop cmd = new PAA_Stop();
50+
cmd.commit(arena, sender, new String[0]);
51+
}
52+
activeEdits.put(sender.getName(), arena);
53+
msg = Language.parse(arena, MSG.ARENA_EDIT_ENABLED, arena.getName());
54+
}
55+
arena.msg(sender, msg);
56+
}
57+
58+
@Override
59+
public String getName() {
60+
return this.getClass().getName();
61+
}
62+
63+
@Override
64+
public void displayHelp(final CommandSender sender) {
65+
Arena.pmsg(sender, Help.parse(HELP.EDIT));
66+
}
67+
68+
@Override
69+
public List<String> getMain() {
70+
return Arrays.asList("edit");
71+
}
72+
73+
@Override
74+
public List<String> getShort() {
75+
return Arrays.asList("!e");
76+
}
77+
78+
@Override
79+
public CommandTree<String> getSubs(final Arena arena) {
80+
return new CommandTree<String>(null);
81+
}
82+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Id:10134
2+
comSha:82db803fad264e008c6fc17e9a7b95527505616e
3+
parentComSha:5e4277b6ca35071da3e9df92c84d081d4119a176
4+
BuggyFilePath:src/net/slipcor/pvparena/commands/PAA_Edit.java
5+
FixedFilePath:src/net/slipcor/pvparena/commands/PAA_Edit.java
6+
StartLineNum:26
7+
EndLineNum:26
8+
repoName:slipcor#pvparena
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Declaration redundancy
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/src/net/slipcor/pvparena/core/StringParser.java b/src/net/slipcor/pvparena/core/StringParser.java
2+
index 93d4dcf3..40e52002 100644
3+
--- a/src/net/slipcor/pvparena/core/StringParser.java
4+
+++ b/src/net/slipcor/pvparena/core/StringParser.java
5+
@@ -35 +35 @@ public final class StringParser {
6+
- public static final Debug DEBUG = new Debug(17);
7+
+ private static final Debug DEBUG = new Debug(17);
8+
@@ -40 +40 @@ public final class StringParser {
9+
- public static Set<String> positive = new HashSet<String>(Arrays.asList(
10+
+ public static final Set<String> positive = new HashSet<String>(Arrays.asList(
11+
@@ -42 +42 @@ public final class StringParser {
12+
- public static Set<String> negative = new HashSet<String>(Arrays.asList(
13+
+ public static final Set<String> negative = new HashSet<String>(Arrays.asList(
14+
@@ -587 +587 @@ public final class StringParser {
15+
- public static String getWoolEnumFromChatColorEnum(final String color) {
16+
+ private static String getWoolEnumFromChatColorEnum(final String color) {

0 commit comments

Comments
 (0)