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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
RandomPanda30
2013-10-06 16:49:15 +01:00
parent da006a7e7b bcbf3eea84
commit 4987986e25
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nl/Steffion/BlockHunt/ConfigC.java
View File

@@ -150,9 +150,9 @@ public enum ConfigC {
normal_ingameSeekerSpawned ("%TAG%A%playername%%N has spawned as a seeker!", normal_ingameSeekerSpawned ("%TAG%A%playername%%N has spawned as a seeker!",
W.messages), W.messages),
normal_ingameGivenSword ("%TAG%NYou were given a sword!", W.messages), normal_ingameGivenSword ("%TAG%NYou were given a sword!", W.messages),
normal_HiderDied ("%TAG%NHider %A%playername%%N died! %A%left%%N hider(s) remain...", normal_ingameHiderDied ("%TAG%NHider %A%playername%%N died! %A%left%%N hider(s) remain...",
W.messages), W.messages),
normal_SeekerDied ("%TAG%NSeeker %A%playername%%N died! He will respawn in %A%secs%%N seconds!", normal_ingameSeekerDied ("%TAG%NSeeker %A%playername%%N died! He will respawn in %A%secs%%N seconds!",
W.messages), W.messages),
normal_winSeekers ("%TAG%NThe %ASEEKERS%N have won!", W.messages), normal_winSeekers ("%TAG%NThe %ASEEKERS%N have won!", W.messages),
normal_winHiders ("%TAG%NThe %AHIDERS%N have won!", W.messages), normal_winHiders ("%TAG%NThe %AHIDERS%N have won!", W.messages),

4
src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java
View File

@@ -101,7 +101,7 @@ public class OnEntityDamageByEntityEvent implements Listener {
ArenaHandler ArenaHandler
.sendFMessage( .sendFMessage(
arena, arena,
ConfigC.normal_HiderDied, ConfigC.normal_ingameHiderDied,
"playername-" "playername-"
+ player.getName(), + player.getName(),
"left-" "left-"
@@ -110,7 +110,7 @@ public class OnEntityDamageByEntityEvent implements Listener {
.size())); .size()));
} else { } else {
ArenaHandler.sendFMessage(arena, ArenaHandler.sendFMessage(arena,
ConfigC.normal_SeekerDied, ConfigC.normal_ingameSeekerDied,
"playername-" + player.getName(), "playername-" + player.getName(),
"secs-" + arena.waitingTimeSeeker); "secs-" + arena.waitingTimeSeeker);
} }