Commit Graph

61 Commits

Author SHA1 Message Date
Jeppa
7b55d41445 Merge remote-tracking branch 'upstream/master'
Conflicts:
	config.yml
	src/me/Travja/HungerArena/BlockStorage.java
	src/me/Travja/HungerArena/ChatListener.java
	src/me/Travja/HungerArena/Chests.java
	src/me/Travja/HungerArena/CommandBlock.java
	src/me/Travja/HungerArena/DeathListener.java
	src/me/Travja/HungerArena/DmgListener.java
	src/me/Travja/HungerArena/FreezeListener.java
	src/me/Travja/HungerArena/HaCommands.java
	src/me/Travja/HungerArena/JoinAndQuitListener.java
	src/me/Travja/HungerArena/Main.java
	src/me/Travja/HungerArena/PlayerWinGamesEvent.java
	src/me/Travja/HungerArena/PvP.java
	src/me/Travja/HungerArena/Signs.java
	src/me/Travja/HungerArena/SpawnsCommand.java
	src/me/Travja/HungerArena/SpectatorListener.java
	src/me/Travja/HungerArena/SponsorCommands.java
	src/me/Travja/HungerArena/TeleportListener.java
	src/me/Travja/HungerArena/WinGamesListener.java
	src/me/travja/HungerArena/BlockStorage.java
	src/me/travja/HungerArena/Blocks.java
	src/me/travja/HungerArena/ChatListener.java
	src/me/travja/HungerArena/Chests.java
	src/me/travja/HungerArena/CommandBlock.java
	src/me/travja/HungerArena/DeathListener.java
	src/me/travja/HungerArena/DmgListener.java
	src/me/travja/HungerArena/FreezeListener.java
	src/me/travja/HungerArena/HaCommands.java
	src/me/travja/HungerArena/JoinAndQuitListener.java
	src/me/travja/HungerArena/Main.java
	src/me/travja/HungerArena/PlayerWinGamesEvent.java
	src/me/travja/HungerArena/PvP.java
	src/me/travja/HungerArena/Signs.java
	src/me/travja/HungerArena/SpawnsCommand.java
	src/me/travja/HungerArena/SpectatorListener.java
	src/me/travja/HungerArena/SponsorCommands.java
	src/me/travja/HungerArena/TeleportListener.java
	src/me/travja/HungerArena/WinGamesListener.java
	src/me/travja/hungerarena/DmgListener.java
	src/me/travja/hungerarena/PlayerWinGamesEvent.java
	src/me/travja/hungerarena/TeleportListener.java
	src/me/travja/hungerarena/WinGamesListener.java
2013-03-30 02:08:52 +01:00
travja
1ebab85ead Fixed bugs 2013-03-28 15:43:17 -06:00
travja
563e453a26 Fixed grace period 2013-03-27 21:33:36 -06:00
travja
c70e5d500f Fixed pre-game itemblocks, added grace period 2013-03-27 21:03:32 -06:00
travja
ad429166a8 Added option for admins to modify arena while all protected 2013-03-23 16:07:54 -06:00
travja
2e4927846f Merge pull request #4 from Jeppa/devtest
Merged: Jeppa quit/join optional force to spawn
2013-03-23 12:28:27 -07:00
Jeppa
dba6deb443 Fixed the join / quit behaviour
Join and Quit fixed, new/unknown player can be forced to default-spawn.
2013-03-23 02:17:53 +01:00
travja
0f302073f7 Fixed bug in Jeppas code 2013-03-21 17:57:54 -06:00
travja
20f8c66bd6 Merge pull request #3 from Jeppa/devtest
Bugs fixed Thanks to Jeppa
2013-03-21 16:50:48 -07:00
Jeppa
faf098b4ae The Fixes again...
updated typo and not used var.
2013-03-21 21:21:32 +01:00
Jeppa
c0447bf3b9 Merge branch 'master' of https://github.com/travja/HungerArena into devtest 2013-03-21 20:48:16 +01:00
Jeppa
73652c19f4 Revert "Bugfix 20-3-2012 Jeppa !"
This reverts commit db43876920.
2013-03-21 20:31:42 +01:00
travja
2a8416d1a8 3/20 - Most recent Dev 2013-03-20 15:47:22 -06:00
Jeppa
db43876920 Bugfix 20-3-2012 Jeppa !
merged routines, fixed "Protect_Always", added possibility for full
Protection when noone is playing...
Fixed autorestart,
added configurable countdown.
reload command : fixed multiple listeners
restart command : fixed reopen, merged routines, added respawn
close command: fixed for multiple arenas and merged routines.
open command: small textfix
fix for whitelisted commands (can be used now...)
2013-03-20 22:44:34 +01:00
travja
fedf9842cd Added back the src file 2013-03-20 15:42:45 -06:00
travja
974b2b50df Removed unimportant files 2013-03-20 15:41:09 -06:00
travja
3bd1f1f87a Removed files 2013-03-20 15:34:45 -06:00
travja
3975ee193e Updated to most recent Dev (3/20) 2013-03-20 15:13:03 -06:00
Jeppa
54510c692f config chages for the new fixes 2013-03-20 19:32:54 +01:00
Jeppa
3010db6370 Now the Bugfix Files ! This are the files from 19-3-2013 2013-03-20 19:04:32 +01:00
Jeppa
7d0592db03 put old files in here for changes to show up... 2013-03-20 18:59:22 +01:00
Jeppa
0a9665d9eb Bugfixes !!!
merged routines, fixed "Protect_Always", added possibility for full
Protection when noone is playing...
Fixed autorestart,
added configurable countdown.
reload command : fixed multiple listeners
restart command : fixed reopen, merged routines, added respawn
close command: fixed for multiple arenas and merged routines.
open command: small textfix
fix for whitelisted commands (can be used now...)
2013-03-20 18:18:45 +01:00
Jeppa
1b534e8e91 Test for Github 2013-03-20 18:15:10 +01:00
Jeppa
4696c01a35 Bugfixes !
merged routines, fixed "Protect_Always", added possibility for full
Protection when noone is playing...
Fixed autorestart,
added configurable countdown.
reload command : fixed multiple listeners
restart command : fixed reopen, merged routines, added respawn
close command: fixed for multiple arenas and merged routines.
open command: small textfix
fix for whitelisted commands (can be used now...)
2013-03-20 17:51:59 +01:00
travja
482e3e8e55 3/15 - Most recent Dev 2013-03-15 23:07:55 -06:00
travja
444ec3ea01 Updated to most recent Dev 2013-02-16 18:03:13 -07:00
travja
a9ff18163d Adding block whitelist/blacklist 2012-10-22 21:05:25 -06:00
travja
b0d29cd907 No known bugs 2012-10-08 17:55:42 -06:00
travja
6b1a6b3c30 Added BlockBreakEvent resets 2012-09-01 22:11:35 -06:00
travja
641ba0b3d1 Tons of fixes!! 2012-08-29 17:58:39 -06:00
travja
3d90d9afce Fixed world restrictions 2012-08-25 11:58:12 -06:00
travja
73e7050762 Added world restrictions 2012-08-25 10:09:49 -06:00
travja
368b69f0f2 Updated to 1.3 2012-08-08 22:11:05 -06:00
travja
6721deef13 Removed files 2012-07-21 12:11:38 -06:00
travja
8d9d998b78 Fixed teleporting, need testers 2012-07-21 12:02:43 -06:00
travja
c5b4f92f7b Improvements and Explosions 2012-07-19 23:16:37 -06:00
Travis Eggett
75fbe3743c Improvements, and Explosions! 2012-07-17 21:32:21 -06:00
Travis Eggett
95d6bfe9c5 Should run smooth now 2012-07-17 17:06:57 -06:00
Travis Eggett
e7e96bd2d8 Fixed Visble errors 2012-07-17 16:19:55 -06:00
Travis Eggett
50f7c905ec Fixed some code 2012-07-17 15:58:45 -06:00
Travis Eggett
fe0bec9ac9 Merged 2012-07-17 15:50:34 -06:00
YoshiGenius
de44f825be Updated code. 2012-07-18 07:14:50 +10:00
Travis Eggett
7fa3e510be Some stuff updated still bugs.. 2012-07-17 14:39:51 -06:00
YoshiGenius
7649fc4682 Change some stuff. 2012-07-17 14:47:12 +10:00
YoshiGenius
f2d2d634a3 2: Update code. 2012-07-15 19:21:36 +10:00
YoshiGenius
2445281be8 First commit. 2012-07-15 09:01:41 +10:00
Travis Eggett
fbbafc76f2 Updates for R3+ and worked on Logging for Arena Resets 2012-06-20 09:26:05 -06:00
Travis Eggett
63f7ceac4c Added an "Unknown Command" message when typed wrong 2012-05-31 15:35:32 -06:00
Travis Eggett
e844f612a8 Added console support and fixed more bugs 2012-05-31 12:08:32 -06:00
Travis Eggett
872448d92a Many bug fixes and more configuration 2012-05-29 23:14:05 -06:00