Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 20:59:39 +01:00
Code Issues Projects Releases Wiki Activity
338 Commits 5 Branches 35 Tags 6.6 MiB
06427445b7
Commit Graph

338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Düsterhus
57f81479fe Cleanup of War class 2011-07-17 10:59:31 +02:00
Tim Düsterhus
38b93ce16d Removing unused wars 2011-07-17 10:59:31 +02:00
Tim Düsterhus
ba1a0fef3a Some javaDoc 2011-07-17 10:59:31 +02:00
taoneill
0e48e6539f Closes gh-250. Death by TNT and by dispenser now properly registered. 2011-07-16 19:30:07 -04:00
taoneill
b910d9e640 Closes gh-243. Added basic kill/death messages. Colored team player names in War chatter. 2011-07-16 18:55:15 -04:00
taoneill
5a03b6c50d Merge branch 'warhub' 2011-07-16 17:56:36 -04:00
taoneill
54ab0d72f3 Closes gh-26. Warhub orientation can now be selected. 2011-07-16 17:55:40 -04:00
Tim Düsterhus
4c561a79dc Merge branch 'master' of github.com:taoneill/war 2011-07-16 23:25:36 +02:00
Tim Düsterhus
a00081ace7 Updated commands in plugin.yml 2011-07-16 23:25:00 +02:00
taoneill
e03365cff6 Closes gh-244. Changing spawn style doesn't mess up the surroundings anymore. 2011-07-16 16:38:33 -04:00
Tim Düsterhus
654841c81d Implemented command whitelist 
Closes #80
 2011-07-16 22:03:11 +02:00
Tim Düsterhus
6361e4e92e Removed the long unneeded comment 2011-07-16 20:21:50 +02:00
Tim Düsterhus
47adca43c4 removed the hard parameter of resetzone 2011-07-16 20:10:46 +02:00
taoneill
3c3a172de4 Merge branch 'fruehjahrsputz' of github.com:taoneill/war into tim 2011-07-16 13:54:33 -04:00
taoneill
66d9aaddc5 Merge remote branch 'remotes/origin/fruehjahrsputz' into tim 2011-07-16 13:45:57 -04:00
Tim Düsterhus
2edcb2d302 More reformatting 2011-07-16 19:38:28 +02:00
Tim Düsterhus
1d9dcb8a00 Added { } around single returns too 2011-07-16 19:12:05 +02:00
Tim Düsterhus
88b2e5051d Removing trailing whitespace 
Adding this everywhere
Adding annotations
Use the block-style for if and consorts
 2011-07-16 19:07:00 +02:00
Tim Düsterhus
ba30e6ca42 if( -> if ( 
for( -> for (
 2011-07-16 19:04:02 +02:00
taoneill
0132699d0e Merge pull request #249 from Evil-Code/opsAreZonemakers 
Improved code a bit :)
 2011-07-16 09:41:49 -07:00
Tim Düsterhus
41b84280c8 Improved code a bit :) 2011-07-16 18:34:43 +02:00
taoneill
ccf78bd951 Closes gh-189. Closes gh-245. Closes gh-248. New on/off settings for /warcfg and /zonecfg: resetOnEmpty, resetOnLoad, resetOnUnload. Use resetonempty to for a warzone reset when the last player leaves. All default to false. Nice thing I should've done from the start: Op is zonemaker by default. 2011-07-16 12:27:13 -04:00
taoneill
f4c1eca815 Closes gh-238. Lobbies are back after /reload or startup even if you don't have a warhub. 2011-07-16 11:35:37 -04:00
taoneill
4447cb8344 Closes gh-132. Added war.pvp permission, which works like war.build to override the pvpinzonesonly setting. Added disablePvpMessage to /warcfg named parameters. 2011-07-16 10:57:36 -04:00
taoneill
067dffb3a1 Merge branch 'tim' 2011-07-14 19:55:56 -04:00
taoneill
daaa3ba7c0 Fixing merge of PVP message disabling. 2011-07-14 19:54:22 -04:00
taoneill
f211d43689 Merge remote branch 'Evil-Code/resetInventoryOnZoneDelete' into tim 2011-07-14 19:52:39 -04:00
taoneill
311a5ea4e8 Merge remote branch 'Evil-Code/fixMonumentHeal' into tim 2011-07-14 19:52:29 -04:00
taoneill
6bf848967e Merge pull request #232 from Evil-Code/master 
General cleanup.

You are awesome Tim, and I am messy. Thanks.
 2011-07-14 16:45:24 -07:00
TimWolla
0869d30911 Fixed the saving of the monument-heal 2011-07-11 17:51:44 +02:00
TimWolla
bd6d02ba76 Uncancels damage event first (Disabling of /god) 2011-07-10 18:21:12 +02:00
TimWolla
6c0212d405 General cleanup (Removed unneeded code) 2011-07-10 14:51:04 +02:00
TimWolla
15d4497c5e Removed the SY as they are worthless now 2011-07-10 14:36:56 +02:00
TimWolla
cbf11a704e Reset the inventory on zone delete 2011-07-08 22:43:37 +02:00
TimWolla
d57d181f68 PVP Message can now be disabled 
Closes https://github.com/taoneill/war/issues/138
 2011-07-08 22:35:47 +02:00
TimWolla
84452d6654 Maven automatically executes the tests now 2011-07-08 22:35:04 +02:00
TimWolla
771547f622 Added missing dependencies 2011-07-08 22:29:40 +02:00
TimWolla
c2f027b7b2 Removed random whitespace and the EOF 2011-07-08 22:19:01 +02:00
TimWolla
2f22b039a9 Updated version 2011-07-08 22:04:52 +02:00
taoneill
06653e6633 Closes gh-227. Emtpy chests and dispenser don't crash teh zone reset (or the server) anymore. Sorry. 2011-07-03 16:42:18 -04:00
taoneill
6929b81dc4 Closes gh-225. Finally compatible with RB935 with PLAYER_MOVE changes that prevent teleport loops that broke the plugin from CB888 on. Now only using event.setTo(). Adjusted some messages. 2011-07-03 01:11:30 -04:00
taoneill
5bad6a26cc Merge branch 'master' of github.com:taoneill/war 2011-07-02 22:45:21 -04:00
taoneill
22239e712e Closes gh-44. Closes gh-153. Closes gh-120. Integrated more of Tim Wolla's changes: invisible spawn setting, flag carriers not protected in spawns anymore to avoid stalemates, warzones can be deleted by name. 2011-07-02 22:44:24 -04:00
taoneill
e3918180fc Merge branch 'tim' 2011-07-02 22:40:54 -04:00
taoneill
9f8e3ce575 Merge branch 'master' of https://github.com/Evil-Code/war into tim 2011-07-02 22:40:07 -04:00
taoneill
9c78c0787d Merge pull request #206 from Evil-Code/6fa2d9113 
Thieves can also be attacked in spawn
 2011-07-02 19:33:52 -07:00
taoneill
4d12279ca7 Closes gh-223. New zone file format. Reduced RAM usage for resets. Conversion happens during the first reset. Also, zones are not reset at startup or shutdown anymore (may add new setting for that). 2011-07-02 22:23:31 -04:00
taoneill
7fae2a22ff Zones now save and reset to-from disk only. This not giving me the boost I hoped for though. Nuts. 2011-06-05 11:06:59 -04:00
taoneill
ab576e09da Merge branch 'perms' into perf 2011-06-05 00:59:39 -04:00
taoneill
1975cce13b Closes gh-217. Now building against Permissions. Tested with GroupManager and Permissions 3.1.4. 2011-06-05 00:58:27 -04:00