JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,743 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

3607 Commits

Author SHA1 Message Date
Cheese 6ed3f93df7 fixed some scoreboard stuff 2015-07-17 16:17:01 +10:00
Sarah b7ad0035bc Implementing UHC team system to ssm, sg and skywars. 2015-07-17 07:06:49 +02:00
Sarah 5389193cab Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-17 06:31:10 +02:00
Sarah 02a71bff68 another git fix 2015-07-17 06:30:53 +02:00
Sarah aaae11d426 Git Fix. 2015-07-17 06:29:32 +02:00
Cheese 44102842c9 added some velocity debug 2015-07-17 13:27:55 +10:00
Cheese cfb4911c25 added ability for teams will fill before moving onto next team 2015-07-17 12:54:53 +10:00
Cheese 63f6adf295 fixed spawn picking 2015-07-17 12:50:34 +10:00
Cheese 3335a7c288 changed skywars teams. forced at 16 teams. 2015-07-17 12:07:09 +10:00
Cheese 558b71f866 fixed thigny 2015-07-17 11:48:14 +10:00
Morten d46ac59e10 Added project start 2015-07-16 01:34:57 +02:00
Sarah 9eee425792 revert mistake from last commit. 2015-07-14 23:46:56 +02:00
Sarah e6aec58ece Updating Map source. 2015-07-14 23:14:56 +02:00
Mysticate 1e1cf6403d Added achievements 2015-07-14 13:31:41 -04:00
Sarah 3a2011ee6a Improving Map System: GameTypes can have more mapSources now. 2015-07-14 13:22:59 +02:00
William Burns d36dd26f42 Added ChestLoot for games. Setup chest filling via ChestLoot for SurvivalGames. 2015-07-14 11:56:13 +01:00
Sarah 2b10aa2cf9 Improving spawn selection in SkywarsTeams. 2015-07-14 08:19:33 +02:00
Sarah a224e5937d Merge branch 'EventGameUpdates' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-14 07:11:48 +02:00
Cheese 251e6206af Merge branch 'SSM2PlayerTeams' of ssh://184.154.0.242:7999/min/Mineplex into SSM2PlayerTeams 2015-07-14 14:02:50 +10:00
Cheese 0315f61038 changed team spawn selection 2015-07-14 14:02:35 +10:00
Sarah 304a51de04 Improving TeamSurvivalGames Scoreboard. 2015-07-14 05:44:58 +02:00
Sarah e72d612379 Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams. 2015-07-14 05:25:08 +02:00
Cheese f2cc2a2c86 youtubers wont get kicked by mac 2015-07-14 10:16:42 +10:00
Cheese cb05049c4a youtubes can turn off vel in hubs 2015-07-14 10:08:41 +10:00
Jonathan Williams f652ad8448 Removing ancient projects that are no longer used. 2015-07-13 13:41:57 -05:00
Mysticate df60659786 Core edits 2015-07-13 12:14:25 -04:00
Ben Sihota b1b8fa59f7 Update IntelliJ builds 2015-07-12 21:11:39 -07:00
Mysticate 616c444c16 Added some things and stuff 2015-07-12 18:15:33 -04:00
Mysticate 0a09ae29f3 Merge remote-tracking branch 'origin/master' into BombLobbers 2015-07-12 18:14:25 -04:00
Sarah bd3641cdac Updating TeamSmash with team Generation Methods. 2015-07-12 02:51:18 +02:00
Sarah be194c5493 Adding Peace Phase Announcement. 2015-07-12 01:00:50 +02:00
Sarah 625f7d3168 Some last small changes. 2015-07-12 00:45:47 +02:00
Sarah 55a1c311bf Kit improvements and balancing. 2015-07-12 00:21:13 +02:00
Sarah 251accb40a Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-11 18:49:38 +02:00
Sarah d41fcb1b7b Improving the SSM Team Game. 2015-07-11 18:44:33 +02:00
Mysticate d0180910e9 Added two new kits. 2015-07-11 10:25:04 -04:00
Sarah 64915a0b7d Implementing Meteoroids for Game end and changing Kit description. 2015-07-11 04:28:37 +02:00
Mysticate 0353b8571d Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers 2015-07-10 16:41:29 -04:00
Jonathan Williams 96a93b6786 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-10 15:32:25 -05:00
Jonathan Williams 7684e1837d Added new support staff to whitelist. 2015-07-10 15:31:38 -05:00
Mysticate f812fd0530 Please push please 2015-07-10 16:31:37 -04:00
Sarah 5429e3eb76 snowfight kits 2015-07-10 13:17:07 +02:00
Sarah 152523fc3d snowfight update 2015-07-10 13:13:38 +02:00
Jonathan Williams f8b3431305 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 11:08:22 -05:00
Jonathan Williams a20a9ba9e7 Fixed issue and updated bungee motd manager. 2015-07-09 11:07:43 -05:00
Jonathan Williams 77a63f72cc Updated staff server white list. 2015-07-09 11:07:16 -05:00
Jonathan Williams ecd8e3d7b0 Increased wait time for redis. 2015-07-09 11:07:00 -05:00
Mysticate 9e07be51c7 Bug fixes 2015-07-09 12:03:56 -04:00
Mysticate 1b3d7f1c20 Fixed and added things 2015-07-08 23:57:48 -04:00
Cheese 49daf597b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 12:47:57 +10:00
Cheese 7d073fdc0d fixed skywars icon 
changed LOSSES to GAMESPLAYED for consistency
 2015-07-09 12:47:40 +10:00
Sarah 068b7bdd47 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-07-09 03:48:44 +02:00
Sarah 5babd8a41a Fix number formatting for different system locale 2015-07-09 03:45:57 +02:00
William Burns 3ba7ba259c Added map selection to MPS. 2015-07-08 15:24:16 +01:00
William Burns e819a4dab3 Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps 2015-07-08 09:56:39 +01:00
William Burns 6008e58c12 Added map selection to MPS. 2015-07-08 09:49:41 +01:00
libraryaddict 7e3fdef2e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-08 18:43:56 +12:00
libraryaddict 1f250bf951 MineWare: Add current progress 2015-07-08 18:43:37 +12:00
Ben Sihota ca880371a6 Merge remote-tracking branch 'origin/master' 2015-07-07 21:19:43 -07:00
Cheese 480a29b874 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-08 13:55:16 +10:00
Cheese e36b0440a4 Merge branch 'bench' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
 2015-07-08 13:55:01 +10:00
Ben Sihota ffbee4a9aa Add more details to /game 
Fix NPE with /game set
 2015-07-07 18:20:27 -07:00
libraryaddict 9eff5b7245 Perks: Forgot to include this in last commit, no harm done. 2015-07-08 07:51:33 +12:00
Jonathan Williams 7bf440f786 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-07 05:18:15 -04:00
libraryaddict 2bec753a34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-07 12:30:37 +12:00
libraryaddict bff3897fab Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered. 2015-07-07 12:30:20 +12:00
Shaun Bennett 6c8c3946a3 Revert "Add IntelliJ IDE library files" 
This reverts commit 71d696278d.
 2015-07-06 17:06:29 -05:00
Ben Sihota 71d696278d Add IntelliJ IDE library files 2015-07-06 13:48:47 -07:00
Cheese cca26165cd swapped sale back to 50% 2015-07-06 11:42:54 +10:00
libraryaddict 2c249e37b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-06 07:07:56 +12:00
libraryaddict e16cb4cef7 Disguise: Initite armorstand vector 2015-07-06 07:07:41 +12:00
libraryaddict 3d0dda382b Stacker: Fixed an infinite loop 2015-07-06 07:07:19 +12:00
Shaun Bennett abaa0ddee8 Level for Bobby 2015-07-05 13:30:16 -05:00
Cheese 7182205fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-05 15:13:33 +10:00
Cheese 8d2b1650af world component for MCPE 2015-07-05 15:13:18 +10:00
libraryaddict e002e4af18 Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises 2015-07-05 13:37:07 +12:00
Jonathan Williams cf035eeb37 Fixed Bungee issues with new redis configs. 2015-07-03 02:17:27 -04:00
Cheese 556e524e18 changed notifications back to 75% sale 2015-07-02 16:14:47 +10:00
Cheese 1e26ebe0bd disabled ice forming 2015-07-02 10:09:39 +10:00
Cheese 0100ca1b8c fixed a derp bug 2015-07-02 09:41:33 +10:00
Cheese dd9fc8e7c6 bridge speed increase 2015-07-01 15:14:46 +10:00
Cheese 0650b73374 more bridge tweaks 2015-07-01 14:16:56 +10:00
Cheese 190e58c37e bridges update 2015-07-01 12:58:54 +10:00
Cheese de36e3d8e4 added WATER_DAMAGE support for maps 
modified some bridges code
 2015-07-01 00:18:06 +10:00
Jonathan Williams c6e4c5c5e4 Fixed mineplexer server status link. 
Fixed issue with ServerManager and default connection.
 2015-06-30 03:49:53 -04:00
Cheese e3d060376b disabled double gem 2015-06-30 13:10:08 +10:00
Ty Sayers cd4bebbeee Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-06-29 19:27:23 -04:00
Ty Sayers 1992205393 Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up. 2015-06-29 19:27:05 -04:00
Jonathan Williams 2069524f15 Merge remote-tracking branch 'remotes/origin/foo' 2015-06-29 18:14:07 -04:00
Jonathan Williams bbb661d686 Fixed up BenefitManager. 2015-06-29 18:07:06 -04:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Jonathan Williams d426c24970 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:14:30 -04:00
Cheese da3c5eeaaf 40k b enefit 2015-06-29 20:14:15 +10:00
Jonathan Williams 9f384b0d3e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:02:57 -04:00
Cheese 48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese 2963f7a61c stacker wont give too many msgs 2015-06-29 10:13:33 +10:00
Cheese b0f8369bcd lowered block falling speed. 
fixed a bug where some chests didnt fall
 2015-06-29 10:09:36 +10:00
Cheese 0ea388379a reduced win req for skywars ach 
enabled beenfit for 40k reward
 2015-06-28 15:16:05 +10:00
Cheese ead402d026 skywars art 2015-06-28 14:31:25 +10:00
Cheese 08e4ef199e added twitch to dguisecmd 2015-06-28 12:53:18 +10:00
Cheese faca14dd23 fixed disguise permission 2015-06-28 12:50:27 +10:00
Cheese 840ebabf2a added delay on mad scientist eggSpawn 
fixed Exp bug
 2015-06-27 20:39:05 +10:00
Jonathan Williams 65a10461cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
 2015-06-27 02:29:07 -05:00
Jonathan Williams 9a4bcd29a1 Fixed Sparks problems... 2015-06-27 02:26:29 -05:00
Cheese 1f34bc40a3 increased time you can hold TNT for in CS 2015-06-27 14:08:16 +10:00
Cheese 4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese d0368a19d8 Players who quit early do not get full game worth of EXP. 2015-06-27 12:38:04 +10:00
Cheese 754026f403 chicken teleport fix 
scientist minion name fix
 2015-06-27 12:18:12 +10:00
Cheese 4183d6f21d some balance 2015-06-27 11:40:40 +10:00
Cheese 270a2e4107 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-27 11:24:33 +10:00
Cheese 4e06a1aae3 fixed a few skywars bugs 
improved warning for bridges
 2015-06-27 11:24:01 +10:00
fooify 4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
fooify 333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Shaun Bennett 8ef52ea103 Mineplex Gold Rush 2.0 2015-06-26 10:50:37 -05:00
Cheese 9a0ac821a2 fixed stat bug 2015-06-26 19:44:13 +10:00
Cheese c0bc522614 split achievement text over 2 lines 2015-06-26 19:32:18 +10:00
Cheese 750769d03a fixed gem thing 2015-06-26 19:12:34 +10:00
Cheese 62a7fd6a99 you now get levels for kills/assists 
fixed scoreboard bug
 2015-06-26 19:12:11 +10:00
Cheese b0019242e7 skywars scoreboard fix 2015-06-26 19:02:34 +10:00
Jonathan Williams 8c427bee24 Fix _gameDisplay bug. 
Fix Skywars quickmenu link.
 2015-06-26 03:57:39 -05:00
Jonathan Williams 8f2c0cf9d8 Fix file names. 2015-06-26 03:15:16 -05:00
Jonathan Williams 62cfa215b2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 03:12:09 -05:00
Jonathan Williams c1ef96bdcd Fixed jre for staff server 2015-06-26 03:12:00 -05:00
Shaun Bennett c158a6f89f Merge remote-tracking branch 'origin/master' 2015-06-26 03:10:53 -05:00
Shaun Bennett 3b6a692a2a Ooops 2015-06-26 03:10:44 -05:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese 9bf58a2d98 disabled pistons 2015-06-26 17:47:04 +10:00
Cheese 1564a8bc51 disabled hoppers 2015-06-26 17:46:05 +10:00
Cheese 17af562f19 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 17:36:25 +10:00
Cheese 59f730ae9d changed sky text and icon to feather 2015-06-26 17:36:12 +10:00
Jonathan Williams f906f08a18 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:34:36 -05:00
Shaun Bennett 2657ef336a Merge remote-tracking branch 'origin/master' 2015-06-26 02:33:00 -05:00
Shaun Bennett 60901cc17e Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-06-26 02:32:51 -05:00
Cheese c31d3609bb soup no longer spawns in stacks 2015-06-26 17:32:46 +10:00
Shaun Bennett 7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Jonathan Williams c78ef9d93d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:30:01 -05:00
Cheese a5aa2bc0e9 text changes 2015-06-26 17:28:23 +10:00
Cheese 2498f7756c skyawrs stats icon 2015-06-26 17:16:16 +10:00
Cheese c514cacd5d more skywars fixes 2015-06-26 17:05:29 +10:00
Cheese 015ba53bbe skywars hub text 2015-06-26 16:39:25 +10:00
Cheese 027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Jonathan Williams efa06d370b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 01:13:42 -05:00
Jonathan Williams 86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Cheese 257c088948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 16:08:17 +10:00
Cheese b744320ecc pearl trail fix 2015-06-26 16:08:04 +10:00
Cheese caa51d0e89 Merge branch 'SkyWars' 2015-06-26 16:04:46 +10:00
Cheese 16af8453e3 pearl fix 2015-06-26 16:04:07 +10:00
Cheese 338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese 8f3d0ad84b fixed some bugs :O 2015-06-26 14:38:39 +10:00
Cheese 0874178973 skywars update! 2015-06-26 14:14:22 +10:00
Cheese 2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
fooify 7f7edddf42 Fix TNT bug in SG - tested, works fine! :) 2015-06-25 19:36:31 -07:00
Cheese 5710831777 fixed webs dropping webs 2015-06-26 12:34:26 +10:00
Cheese 7d4e36651f less random chests 2015-06-26 12:26:57 +10:00
Cheese fdbaa4e9c7 dont allow overfill 2015-06-26 12:18:25 +10:00
Cheese f1da68a82a fixed chickens not spawning 2015-06-26 12:14:35 +10:00
Cheese 00da27a3d6 added middle chests 
added chicken spawns
added zombie/chicken loot
 2015-06-26 12:06:40 +10:00
Cheese beb78270e5 skywars loot changes 2015-06-26 11:54:35 +10:00
Cheese bb569a26e2 skywars update 2015-06-26 11:22:33 +10:00
Cheese b48820a753 ore gen fixed! 2015-06-26 10:50:38 +10:00
Cheese d9a8d2b6ab ore changes 2015-06-26 10:36:45 +10:00
Jeremiah Bishop 0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
fooify 2679d19a81 Missed a spot. 2015-06-25 08:19:12 -07:00
fooify ba9e4ba5d9 Fix staff server not hiding in friends list 2015-06-25 08:17:28 -07:00
Cheese 2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
 2015-06-25 20:48:34 +10:00
Cheese 2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jonathan Williams 526b0dadb6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-25 04:58:26 -05:00
Jonathan Williams 567bb5cd6c Fixed up MotdManager so that old values don't overwrite in the db. 2015-06-25 04:58:16 -05:00
Jonathan Williams 5bdb90b459 Changed disguise perm to YOUTUBE 2015-06-25 04:57:56 -05:00
Jeremiah Bishop ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Cheese b77279a160 fixed notif msg 2015-06-25 11:22:23 +10:00
Jeremiah Bishop cd10a2ad79 Fixed both kits 
Added game achievements.
 2015-06-24 20:08:31 -04:00
fooify a36af0acc4 Remove space :) I assume this isn't intended 2015-06-24 10:28:39 -07:00
fooify ea3c04b8c1 Add fooify to list of AFKers 2015-06-24 10:24:08 -07:00
Jeremiah Bishop 5b4a3249ca Added chest loot and such. 2015-06-22 21:42:45 -04:00
Jeremiah Bishop 7583e4170b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-22 21:40:43 -04:00
Cheese 3a06b54b7f Changed notifications to 50% off sale 2015-06-22 17:10:03 +10:00
Jeremiah Bishop 03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00
Cheese 648355ac17 mapparser skywars 2015-06-22 11:33:25 +10:00
Jeremiah Bishop a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Jeremiah Bishop e12ff7ef7d Fixed? 2015-06-20 22:20:30 -04:00
Jeremiah Bishop 3cf1297d89 Added SkyWars ;) 2015-06-20 22:08:15 -04:00
Aaron Brock 5280433dbd Added the Pair class for simple 2 object storing, and added upperCaseCount and lowerCaseCount to UtilText. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 10:03:53 -04:00
Aaron Brock 3532dea892 Allowed Helper+ to bypass anti-hackusating 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 10:01:50 -04:00
Jonathan Williams 91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Jonathan Williams 90e13b4b9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-20 03:37:33 -05:00
Jonathan Williams f92e864c30 Updated motd. 2015-06-20 03:37:22 -05:00
Jonathan Williams dbde6890a0 Add fallback to load by name if no uuid. 2015-06-20 03:36:55 -05:00
Aaron Brock 8ea23f96fc Froze time using doDayNightCycle instead of setting the time on UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:36:05 -04:00
Aaron Brock da981980df Added world.setThundering(false); 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:35:11 -04:00
Aaron Brock 9cedb3b742 Rewrote how hackusations are detected. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:10:26 -04:00
Aaron Brock 1f0accd2a1 Fixed a little boolean derp that stopped people from breaking blocks. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:09:21 -04:00
Cheese 478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10:00
Cheese 77bf332c29 level 25 is uneffected by chat delay 2015-06-20 11:18:31 +10:00
Cheese 2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
Aaron Brock 750dddeabc Editing .classpath and a main testing method in UtilBlock 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-19 21:10:10 -04:00
Aaron Brock 61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese 13ae7a19db jr.dev rank up 2015-06-19 18:06:40 +10:00
Cheese cf152c4897 fixed notifs being sent to people who didnt need them 2015-06-19 13:46:56 +10:00
Cheese de83e58e75 removed debug 2015-06-19 13:29:32 +10:00
Cheese 8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Aaron Brock 76e4dc6056 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-18 19:50:06 -04:00
Jeremiah Bishop dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Cheese 9a3a014dd5 removed debug! 2015-06-18 12:04:49 +10:00
Aaron Brock b0ca5ca4aa Freezes the time using doDayLightCycle instead of using a UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:54:28 -04:00
Aaron Brock 41e77b1ade Fixed double-half-slabs (line 68) 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:49:35 -04:00
Cheese 6886484d79 Fixed Micro Battles lag (stupid lava) 
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
 2015-06-17 13:02:12 +10:00
Cheese 47744a80e9 jnr dev 2015-06-17 10:44:29 +10:00
Cheese 3014521e79 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-17 10:43:01 +10:00
Cheese c8843aa2b2 jnr dev rank 2015-06-17 10:42:20 +10:00
Jonathan Williams 0d12a2c12d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-16 12:43:04 -05:00
libraryaddict b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Jonathan Williams 88328148d1 Modified hardcoded IPs for Bungee player counts. 
Added Jr Dev rank.
 2015-06-15 12:52:59 -05:00
Jonathan Williams 47099a0b20 Changed default redis ip to new us redis. 
Changed previous server to gold text when sending to new server.
 2015-06-12 15:45:54 -05:00
Cheese a141cec104 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-11 08:57:04 +10:00
Cheese 390ffcab6d bridges support for lillypads map 2015-06-11 08:56:32 +10:00
Jonathan Williams f0ce43ca5a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-09 13:22:45 -05:00
Shaun Bennett a20f41be09 Merge remote-tracking branch 'origin/master' 2015-06-09 13:21:26 -05:00
Shaun Bennett 3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
libraryaddict 37c6593753 Hub: Fix rulebook 2015-06-10 05:27:19 +12:00
libraryaddict 2971761a5e Game stop command: Move unregister of game listener after the gamestate has been changed 2015-06-09 22:19:03 +12:00
Jonathan Williams c6352445cf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-08 23:18:06 -05:00
libraryaddict 1f08c989b5 Minestrike: Enforce resource pack 2015-06-09 03:31:24 +12:00
libraryaddict 8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict fd3232f45d Mineware: Rename old MineWare and move packages 2015-06-06 18:30:47 +12:00
libraryaddict ef9c69f356 UtilShapes: Fix a method, add a space in OldMineWare in GameType 2015-06-06 18:08:37 +12:00
libraryaddict 5f2810ae37 SurvivalGames: Fix anyone able to start game 2015-06-06 18:07:55 +12:00
Cheese f9b49caeed More gems for bridges/sg kills 
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
 2015-06-05 12:21:20 +10:00
libraryaddict 3a6c030f01 ConditionManager: Use a scheduler if the potion effect is being removed due to potion effect's doing something 2015-06-04 16:01:52 +12:00
libraryaddict a961e5f0d5 Wizards: Don't gain wands from stats page 2015-06-02 18:49:50 +12:00
libraryaddict 4d8a54e7ba Wizards: Add spellbook on /spec 2015-06-02 18:49:27 +12:00
libraryaddict bcdb851e21 Teleport: Don't disqualify staff if they are not alive 2015-06-02 18:48:45 +12:00
libraryaddict 35c005feb8 Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players 2015-05-30 10:30:30 +12:00
libraryaddict 092447170e Game Border: Fix typo that offsets border by one block 2015-05-30 10:24:15 +12:00
libraryaddict ae41f232b0 GameType: Change to reflection for creating game instances 2015-05-30 10:23:46 +12:00
libraryaddict 574dd16022 Hub: Modify rulebook 2015-05-30 10:20:28 +12:00
libraryaddict 6c9963e1b3 CommandCenter: Cancel command event straight after verifying that its been registered 2015-05-30 05:44:49 +12:00
Shaun Bennett 7d43b146b7 [Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins 2015-05-28 19:05:45 -05:00
Shaun Bennett cc1219fd38 [Spigot] Spigot class change for Ty 2015-05-28 15:24:10 -05:00
Jonathan Williams 2c5471cb34 Added ability to see which server you were sent from. 2015-05-28 09:33:49 -05:00
libraryaddict d84bd4ffe4 Messaging: Now with censors! 2015-05-28 10:13:31 +12:00
Shaun Bennett a900a2a70a [Arcade] Another attempt at fixing spectator gui.... :^) 2015-05-26 19:50:01 -05:00
Shaun Bennett 25ba20e411 [Arcade] Fixes for DMT and DT not counting loses properly 2015-05-26 19:28:42 -05:00
Shaun Bennett 0499e1acf1 Merge remote-tracking branch 'origin/master' 2015-05-26 18:55:42 -05:00
libraryaddict e15e42afae UHC: Expanded from 32 blocks to 36 2015-05-27 02:40:27 +12:00
libraryaddict b8cd2aaece UHC: Expand anti-build protection from 16 blocks to 32 2015-05-26 11:04:27 +12:00
libraryaddict c53d52ee42 UHC: Disable gadgets 2015-05-24 20:17:39 +12:00
libraryaddict 21aa97b3b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-24 20:13:43 +12:00
libraryaddict 63e28e25c9 HoleInTheWall: Push the failed game 2015-05-24 20:10:56 +12:00
libraryaddict 0d0d5eea64 Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1 2015-05-24 20:10:16 +12:00
Jonathan Williams 96b1df4ee0 Fixed global player count. 
Fixed tasks.
 2015-05-22 14:33:25 -07:00
Jonathan Williams 303cfd02fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 23:12:27 -07:00
Jonathan Williams f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Jonathan Williams 476dd17ffe Fix for null rank in /c staff server. 2015-05-17 23:11:04 -07:00
Shaun Bennett c107f4d0d9 [Arcade] Working on private servers 2015-05-17 16:31:09 -05:00
Shaun Bennett 5cd191f582 Merge remote-tracking branch 'origin/master' 2015-05-17 16:29:01 -05:00
Jonathan Williams 375b23db3c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 13:46:46 -07:00
Ty Sayers afb0b1cfdf Add Charset argument for reading File lines in ServerManager, ideally to prevent compilation issues with other java versions. 2015-05-17 14:50:22 -04:00
Jonathan Williams e728edb44d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 01:29:49 -07:00
Jonathan Williams 47ff9101fd Finished up changes for game task conversion. 2015-05-17 01:28:44 -07:00
Ty Sayers e8d5d50162 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-05-16 13:13:53 -04:00
Ty Sayers 672fc99a3e Add fail-safe default connection in case of issue in proper redis-config.dat generation. Add documentation to clarify purposes related to redis configuration. 2015-05-16 13:12:20 -04:00
Ty Sayers a8b0dddf17 Add support for redis configuration file to determine viable redis master and slave connections, that can be set to be region-dependant. Fix leakage issue with command manager with not properly returning broken jedis resources. Funnel all redis connection requests through ServerManager for easier configuration use. 2015-05-16 13:01:21 -04:00
Shaun Bennett 1e9abaf002 [Arcade] Add more games to private servers 2015-05-15 23:38:43 -05:00
libraryaddict f899194e3b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-15 12:23:27 +12:00
libraryaddict 091f98fa9d DrawMyThing: Remove all found words from the checked string when looking for multiple guesses 2015-05-15 12:23:05 +12:00
Shaun Bennett 6b7c52cb87 [Arcade] Add additional hub clock check 2015-05-14 15:17:45 -05:00
Jonathan Williams 5a8f93f3db Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-14 00:12:22 -07:00
Jonathan Williams b7cdc82cd2 Fixed server sorter for UHC. 
Work on converting to UltraDNS api.
 2015-05-14 00:12:13 -07:00
Mini-Chiss d390d83dd1 removed some meh words 2015-05-13 22:35:26 -05:00
Mini-Chiss f49c2ca546 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 22:27:41 -05:00
Shaun Bennett 0d2157b4f3 [Core] Fix /stats lava bucket bug 2015-05-13 23:23:43 -05:00
Shaun Bennett 2c020d10a6 Merge remote-tracking branch 'origin/master' 2015-05-13 22:52:22 -05:00
Shaun Bennett 84c53347f8 [Hub] Add UHC to Quick server menu. Better formatting coming soon! 2015-05-13 22:52:14 -05:00
Mini-Chiss e68a2775e8 ex p chnage 2015-05-13 22:27:33 -05:00
libraryaddict 67f1e4ad1f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 14:29:43 +12:00
libraryaddict 0fc1d680af UHC: Add 20 seconds of invincibility on game start 2015-05-14 14:29:30 +12:00
Mini-Chiss 44cb6d8a62 increased exp more 2015-05-13 17:08:56 -05:00
libraryaddict 4bc38e3396 Arcade: Removed ocean, river and swampland from biome generation for UHC 2015-05-14 09:55:22 +12:00
Jonathan Williams a6cf1309ff Fix for ranks not applying. 2015-05-13 14:33:31 -07:00
Jonathan Williams 5bb91f4167 Catch null taskList 2015-05-13 14:27:35 -07:00
libraryaddict c46bdfd2dc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 09:18:51 +12:00
libraryaddict 1b27e84e54 DrawMyThing: Fixed a check being in the wrong brackets 2015-05-14 09:18:35 +12:00
Mini-Chiss 093bbde792 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 15:45:41 -05:00
Mini-Chiss 2c3116a7a6 removed firework and sound from legend join 2015-05-13 15:45:29 -05:00
Mini-Chiss bd58c06017 fixed being able to team with self in UHC 
fixed eventgame admin toggle
 2015-05-13 13:32:20 -05:00
Mini-Chiss c34cac42ee Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 13:20:14 -05:00
Mini-Chiss c26174ffa2 fixed team name 2015-05-13 13:20:05 -05:00
Jonathan Williams 3b024de521 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-13 01:35:05 -07:00
Jonathan Williams 1c6a12528c Added ability for LT to modify Admin ranks. 
Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
 2015-05-13 00:58:45 -07:00
libraryaddict bfb5e85efd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 19:14:56 +12:00
libraryaddict 938386bf77 Wizards: Removed chainmail loot, added gold armor instead 2015-05-13 19:14:40 +12:00
Jonathan Williams 98dcb9747a Added UHC support to server sorter. 2015-05-13 00:10:17 -07:00
Jonathan Williams 82903fde47 Updates for task conversion. 2015-05-13 00:00:37 -07:00
Mini-Chiss a744a466a3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 00:05:10 -05:00
Mini-Chiss f9735006b8 removed hub uhc hourly announcements 2015-05-13 00:05:00 -05:00
libraryaddict 20aeccb3be Wizards: Lowered ice shards max level to 3, removed damage from web shot 2015-05-13 14:04:19 +12:00
libraryaddict 744c867990 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 13:19:09 +12:00
libraryaddict d2e37df4ca DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word 2015-05-13 13:18:54 +12:00