Skip to content

Commit 0bbc785

Browse files
committed
add data and README file
1 parent 04a17a5 commit 0bbc785

8,160 files changed

Lines changed: 1825210 additions & 1 deletion

File tree

Some content is hidden

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

.DS_Store

6 KB
Binary file not shown.

All/.DS_Store

6 KB
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v1.0.9.287 - compare changes or fix greedy replacements - derp
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/PAG_Arenaclass.java b/src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
2+
index e0d9c37b..14240694 100644
3+
--- a/src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
4+
+++ b/src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
5+
@@ -59 +59 @@ public class PAG_Arenaclass extends AbstractArenaCommand {
6+
- sender.sendMessage(Language.parse(arena, MSG.CLASS_SELECTED, aClass.getName().toLowerCase()));
7+
+ sender.sendMessage(Language.parse(arena, MSG.CLASS_SELECTED, aClass.getName()));
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package net.slipcor.pvparena.commands;
2+
3+
import net.slipcor.pvparena.arena.Arena;
4+
import net.slipcor.pvparena.arena.ArenaClass;
5+
import net.slipcor.pvparena.arena.ArenaPlayer;
6+
import net.slipcor.pvparena.core.Config.CFG;
7+
import net.slipcor.pvparena.core.Help;
8+
import net.slipcor.pvparena.core.Language;
9+
import net.slipcor.pvparena.core.Help.HELP;
10+
import net.slipcor.pvparena.core.Language.MSG;
11+
import net.slipcor.pvparena.managers.InventoryManager;
12+
13+
import org.bukkit.command.CommandSender;
14+
import org.bukkit.entity.Player;
15+
16+
/**
17+
* <pre>PVP Arena JOIN Command class</pre>
18+
*
19+
* A command to join an arena
20+
*
21+
* @author slipcor
22+
*
23+
* @version v0.10.0
24+
*/
25+
26+
public class PAG_Arenaclass extends AbstractArenaCommand {
27+
public PAG_Arenaclass() {
28+
super(new String[] {"pvparena.user"});
29+
}
30+
31+
@Override
32+
public void commit(final Arena arena, final CommandSender sender, final String[] args) {
33+
if (!this.hasPerms(sender, arena) || !arena.getArenaConfig().getBoolean(CFG.USES_INGAMECLASSSWITCH)) {
34+
return;
35+
}
36+
37+
if (!argCountValid(sender, arena, args, new Integer[]{1})) {
38+
return;
39+
}
40+
41+
if (!(sender instanceof Player)) {
42+
Arena.pmsg(sender, Language.parse(arena, MSG.ERROR_ONLY_PLAYERS));
43+
return;
44+
}
45+
46+
final ArenaPlayer aPlayer = ArenaPlayer.parsePlayer(sender.getName());
47+
48+
final ArenaClass aClass = arena.getClass(args[0]);
49+
50+
if (aClass == null) {
51+
sender.sendMessage(Language.parse(arena, MSG.ERROR_CLASS_NOT_FOUND, args[0]));
52+
return;
53+
}
54+
55+
InventoryManager.clearInventory(aPlayer.get());
56+
aPlayer.setArenaClass(aClass);
57+
ArenaPlayer.givePlayerFightItems(arena, aPlayer.get());
58+
59+
sender.sendMessage(Language.parse(arena, MSG.CLASS_SELECTED, aClass.getName()));
60+
}
61+
62+
@Override
63+
public String getName() {
64+
return this.getClass().getName();
65+
}
66+
67+
@Override
68+
public void displayHelp(final CommandSender sender) {
69+
Arena.pmsg(sender, Help.parse(HELP.ARENACLASS));
70+
}
71+
}
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package net.slipcor.pvparena.commands;
2+
3+
import net.slipcor.pvparena.arena.Arena;
4+
import net.slipcor.pvparena.arena.ArenaClass;
5+
import net.slipcor.pvparena.arena.ArenaPlayer;
6+
import net.slipcor.pvparena.core.Config.CFG;
7+
import net.slipcor.pvparena.core.Help;
8+
import net.slipcor.pvparena.core.Language;
9+
import net.slipcor.pvparena.core.Help.HELP;
10+
import net.slipcor.pvparena.core.Language.MSG;
11+
import net.slipcor.pvparena.managers.InventoryManager;
12+
13+
import org.bukkit.command.CommandSender;
14+
import org.bukkit.entity.Player;
15+
16+
/**
17+
* <pre>PVP Arena JOIN Command class</pre>
18+
*
19+
* A command to join an arena
20+
*
21+
* @author slipcor
22+
*
23+
* @version v0.10.0
24+
*/
25+
26+
public class PAG_Arenaclass extends AbstractArenaCommand {
27+
public PAG_Arenaclass() {
28+
super(new String[] {"pvparena.user"});
29+
}
30+
31+
@Override
32+
public void commit(final Arena arena, final CommandSender sender, final String[] args) {
33+
if (!this.hasPerms(sender, arena) || !arena.getArenaConfig().getBoolean(CFG.USES_INGAMECLASSSWITCH)) {
34+
return;
35+
}
36+
37+
if (!argCountValid(sender, arena, args, new Integer[]{1})) {
38+
return;
39+
}
40+
41+
if (!(sender instanceof Player)) {
42+
Arena.pmsg(sender, Language.parse(arena, MSG.ERROR_ONLY_PLAYERS));
43+
return;
44+
}
45+
46+
final ArenaPlayer aPlayer = ArenaPlayer.parsePlayer(sender.getName());
47+
48+
final ArenaClass aClass = arena.getClass(args[0]);
49+
50+
if (aClass == null) {
51+
sender.sendMessage(Language.parse(arena, MSG.ERROR_CLASS_NOT_FOUND, args[0]));
52+
return;
53+
}
54+
55+
InventoryManager.clearInventory(aPlayer.get());
56+
aPlayer.setArenaClass(aClass);
57+
ArenaPlayer.givePlayerFightItems(arena, aPlayer.get());
58+
59+
sender.sendMessage(Language.parse(arena, MSG.CLASS_SELECTED, aClass.getName().toLowerCase()));
60+
}
61+
62+
@Override
63+
public String getName() {
64+
return this.getClass().getName();
65+
}
66+
67+
@Override
68+
public void displayHelp(final CommandSender sender) {
69+
Arena.pmsg(sender, Help.parse(HELP.ARENACLASS));
70+
}
71+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Id:10070
2+
comSha:1d330daf23b95a56942c1e2b223e80274875892c
3+
parentComSha:2458757bf240a1d573896d71a43a6c89612ff860
4+
BuggyFilePath:src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
5+
FixedFilePath:src/net/slipcor/pvparena/commands/PAG_Arenaclass.java
6+
StartLineNum:59
7+
EndLineNum:59
8+
repoName:slipcor#pvparena
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v1.0.9.287 - compare changes or fix greedy replacements - derp
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/arena/Arena.java b/src/net/slipcor/pvparena/arena/Arena.java
2+
index 4ee3d3de..a578bc0f 100644
3+
--- a/src/net/slipcor/pvparena/arena/Arena.java
4+
+++ b/src/net/slipcor/pvparena/arena/Arena.java
5+
@@ -926 +926 @@ public class Arena {
6+
- this.selectClass(p, aClass.getName().toLowerCase());
7+
+ this.selectClass(p, aClass.getName());

0 commit comments

Comments
 (0)