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

1301 Commits

Author SHA1 Message Date
Shaun Bennett
44e30a0903 SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui 2015-08-06 15:34:56 -05:00
Sarah
d8041ba582 Fixing Players can disguise as disguised Players. 2015-08-06 20:57:56 +02:00
Sarah
4a10f8d71a fixing very last bugs. Ready to push!!! 2015-08-06 13:23:38 +02:00
Shaun Bennett
35d999d747 Remove some debug messages 2015-08-06 05:56:31 -05:00
Shaun Bennett
9e9f9862d0 Bonus bonus bonus! 2015-08-06 05:47:32 -05:00
Sarah
6947b54e66 16 char limit and Steve Skin. 2015-08-06 09:45:02 +02:00
Sarah
5809359449 Random Player disguises. 2015-08-06 09:19:19 +02:00
Sarah
208ce95c97 No youtuber Disguise. 2015-08-06 09:11:39 +02:00
Sarah
b52a9477fe No Staff disguises! 2015-08-06 09:07:30 +02:00
Sarah
16a8164030 Fixing last bugs and disabling coin bombs while diguised. 2015-08-06 08:42:09 +02:00
Shaun Bennett
4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
Jonathan Williams
da5387c54f Fixed ConcurrentModification for ServerManager cooldowns. 2015-08-05 01:33:09 -05:00
Shaun Bennett
bcd4f4f9e2 Open gui through npc 2015-08-05 00:41:50 -05:00
Jonathan Williams
b2116cc7e8 Merge branch 'OldServerSelector' 2015-08-04 13:56:23 -05:00
Jonathan Williams
813dfb26b3 Finalized revert to old server menus. 
Tied in solo/team buttons to use old server menu as well.
 2015-08-04 13:54:06 -05:00
Shaun Bennett
b33b0ac935 More bonus work 2015-08-04 04:00:51 -05:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Shaun Bennett
e200ddd777 Merge branch 'master' into Bonus 
# Conflicts:
#	Plugins/.idea/misc.xml
 2015-08-03 08:32:45 -05:00
Sarah
fc412b0782 Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG. 2015-08-03 14:36:51 +02:00
Jonathan Williams
37b779f108 Fixes for servers. 2015-08-03 05:55:33 -05:00
Jonathan Williams
6c0666c59b Fix for server groups / teams. 2015-08-03 03:20:27 -05:00
Jonathan Williams
302252f193 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 02:56:31 -05:00
Jonathan Williams
af0d769d3d Fixed skywars quick shop. 
Fixed issue with skywars not opening.
Fixed chest size for MPS
 2015-08-03 02:56:24 -05:00
Mini-Chiss
5bb2f80b8e fixed text 2015-08-03 09:54:34 +02:00
Mini-Chiss
72c473ad6b removed annoying mineplex thing from subtext in news 2015-08-03 09:51:10 +02:00
Jonathan Williams
adcd91bf61 Servers with more than 40 max slots always send to largest server. 
Fixed space in Solo lore.
 2015-08-03 02:07:23 -05:00
Mini-Chiss
6a1e5d6bfc changed item text 2015-08-03 08:23:49 +02:00
Jonathan Williams
c32074e733 Fixed MPS/Event server guis so they open up like old. 
Changed sticks to player heads in solo/team selection.
 2015-08-03 00:53:06 -05:00
Jonathan Williams
bfaa0e6849 Fixed event/mps hardcode. 2015-08-02 23:51:43 -05:00
Ty Sayers
58933fc855 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 21:19:00 -04:00
Ty Sayers
944a4a9535 Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process. 2015-08-02 21:18:24 -04:00
Jonathan Williams
a561bbbf12 Added hardcode for EVENT/MPS :D 2015-08-02 19:41:42 -05:00
Shaun Bennett
cadd21c18b More bonus work 2015-08-02 19:12:39 -05:00
Ty Sayers
32a2687991 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 20:00:15 -04:00
Jonathan Williams
d9a641fd92 Updated ServerManager to read server npc stuff from redis. 
Updated ServerGroup to have NPC name in it.
 2015-08-02 18:59:43 -05:00
Ty Sayers
4852e69991 Temporary un-finished changes for adding in team/solo UI pages and allowing players to select. 2015-08-02 19:19:40 -04:00
Ty Sayers
70c1b883db Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups. 2015-08-02 18:20:52 -04:00
Ty Sayers
c2f6c402da Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 13:25:09 -04:00
Ty Sayers
612d967aa0 Add ability for auto-joining of gametypes to bypass manual server selection by player. 2015-08-02 13:24:59 -04:00
Shaun Bennett
db15ffad72 Bonus changes + Update jooq 2015-08-02 05:17:51 -05:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Shaun Bennett
11e49b9678 Some updates 2015-08-02 04:28:57 -05:00
Mini-Chiss
ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Shaun Bennett
fd65f27f0f Fix some typos/formatting issues 2015-07-31 10:01:19 -05:00
fooify
b623f025ff manually updating something 2015-07-29 14:31:11 -07:00
fooify
db5c5a9888 *crosses fingers* please work! 2015-07-29 14:12:52 -07:00
Aaron Brock
971908d38b Stuff 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:52:43 -04:00
Aaron Brock
832fb4638a More things 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:42:00 -04:00
Ben Sihota
7d9fd61c8e Display changes 2015-07-26 22:31:40 -07:00
Ben Sihota
0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Ben Sihota
47d410370d Merge branch 'horus-bug-fixes' 2015-07-26 18:20:39 -07:00
Jonathan Williams
6d367e3cee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:38:54 -07:00
Jonathan Williams
84be48f264 Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method. 
Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
 2015-07-25 01:30:50 -07:00
Ty Sayers
13f47ad903 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
 2015-07-24 13:59:01 -05:00
Ben Sihota
fe80ed373a Fix numerous trello bugs 
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
 2015-07-22 22:28:44 -07:00
Mysticate
e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Ty Sayers
0b49d053fe Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events. 2015-07-20 15:57:57 -05:00
Mysticate
d38fc1a603 Reverted things 2015-07-20 16:40:37 -04:00
Mysticate
6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
Shaun Bennett
5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05: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
Shaun Bennett
9ccc85a79e Improved block restore for Events 2015-06-30 22:30:49 -05:00
fooify
4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Cheese
2963f7a61c stacker wont give too many msgs 2015-06-29 10:13:33 +10:00
Cheese
0ea388379a reduced win req for skywars ach 
enabled beenfit for 40k reward
 2015-06-28 15:16:05 +10:00
fooify
4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
Jonathan Williams
8c427bee24 Fix _gameDisplay bug. 
Fix Skywars quickmenu link.
 2015-06-26 03:57:39 -05:00
Cheese
1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +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
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
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
015ba53bbe skywars hub text 2015-06-26 16:39:25 +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
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
91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05: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
61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese
8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +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
libraryaddict
37c6593753 Hub: Fix rulebook 2015-06-10 05:27:19 +12:00
libraryaddict
574dd16022 Hub: Modify rulebook 2015-05-30 10:20:28 +12:00
Jonathan Williams
f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07: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
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
2c3116a7a6 removed firework and sound from legend join 2015-05-13 15:45:29 -05: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
Jonathan Williams
98dcb9747a Added UHC support to server sorter. 2015-05-13 00:10:17 -07:00
Mini-Chiss
f9735006b8 removed hub uhc hourly announcements 2015-05-13 00:05:00 -05:00
Shaun Bennett
53555a42cd [Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats 2015-05-12 17:14:50 -05:00
Mini-Chiss
643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
libraryaddict
a558995e12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 09:52:21 +12:00
Jonathan Williams
b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Shaun Bennett
46c07665e1 Merge remote-tracking branch 'origin/master' 2015-05-11 00:44:34 -05:00
Shaun Bennett
800ce68637 Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking) 2015-05-10 16:58:04 -05:00
libraryaddict
241935ef63 SurvivalGames: Removed description of deep freeze and updated to beware of borders 2015-05-11 09:13:04 +12:00
Mini-Chiss
822718095d cannot PM from spawn 
first push of cards game
 2015-05-09 12:23:07 -05:00
Jonathan Williams
a7407d8b8c Added all minigames standalones into mixed arcade player count. 2015-05-04 22:51:21 -05:00
Jonathan Williams
4252bf70df Fix Master Builder game button in quick menu. 2015-05-04 01:40:57 -05:00
Jonathan Williams
c8b5c84aa6 Added Master Builder quick game menu option. 
Added player counts to quick game menu
 2015-05-04 00:42:49 -05:00
Mini-Chiss
4f4aeac12c fixed typo 2015-05-03 23:34:09 -05:00
Mini-Chiss
e013f8af8a sky text for hub change 2015-05-03 19:49:16 -05:00
Mini-Chiss
40d56c3500 Converted all code to updated UtilParticle methods 
/suicide
 2015-05-03 16:37:00 -05:00
Jonathan Williams
283d550903 Added Wizards to quick game menu. 2015-05-01 01:24:01 -05:00
Jonathan Williams
fa4466b6a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-05-01 00:13:39 -05:00
Jonathan Williams
d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05:00
libraryaddict
9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-04-22 03:45:59 +12:00
Cheese
c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Cheese
ff0883e7d7 fixed easter egg duration 
parser list improvement
 2015-04-03 21:47:43 +11:00
Cheese
ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Shaun Bennett
50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
Jonathan Williams
f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams
6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account. 
Added account id retrieval on login.
Added account id caching in redis.
 2015-03-25 15:10:59 -07:00
Jonathan Williams
09fe3ad6a8 NewsManager : Reduced dynamic string generation every time news changes 2015-03-25 15:04:00 -07:00
Cheese
5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00
Cheese
28b3828007 slowed hub invis update 2015-03-20 23:48:17 +11:00
libraryaddict
52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
Cheese
73c66fa93f Merge branch 'SpecRemoveCreative' 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-17 14:57:17 +11:00
Cheese
4581f49948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 13:39:54 +11:00
Cheese
420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Jonathan Williams
cb93769e03 Converted Bungee to redis. 
Increased DBPool maximum connections to 5.
 2015-03-13 17:53:36 -07:00
Cheese
c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Jonathan Williams
bf87cfd0cd Merge remote-tracking branch 'remotes/origin/sql_pooling' 2015-03-11 18:30:52 -07:00
Jonathan Williams
626bfc35fc Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."" 
This reverts commit 215ec7b00d.

Enabled multi-queries on db pool.
Cleaned up some code using new pooling getConnection inappropriately
 2015-03-11 18:05:13 -07:00
Jonathan Williams
0b2ce48b3e Fix dead lobbies bug. 2015-03-11 17:27:21 -07:00
Ty Sayers
215ec7b00d Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections." 
This reverts commit adfe5fb74e.
 2015-03-07 19:38:06 -05:00
Ty Sayers
adfe5fb74e Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections. 2015-03-07 19:36:54 -05:00
Jonathan Williams
09ecb994f6 Pooled Friend/Ignore/Preferences/Poll/Elo repositories. 
Removed ArcadeRepository as its unused.

Removed target server check for RedisCommand because it breaks other commands.
 2015-03-06 01:36:25 -08:00
Jonathan Williams
5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
Shaun Bennett
90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
libraryaddict
bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
libraryaddict
56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
libraryaddict
d29b43d645 Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages. 2015-02-17 15:17:14 +13:00
libraryaddict
9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
libraryaddict
29f3241098 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7 Add commands /ignore and /unignore. Fixed mutes not working with private messaging 2015-02-10 02:31:33 +13:00
Mini-Chiss
26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Shaun Bennett
c285fae035 Merge remote-tracking branch 'origin/master' 2015-02-06 23:40:14 -05:00
Shaun Bennett
ed8638ae9f Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it 2015-02-06 23:39:22 -05:00
libraryaddict
8851cccff4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-07 03:53:17 +13:00
libraryaddict
68d1ba4507 Add API to create walls of maps to create a giant image. Please use responsibly. 2015-02-07 03:52:19 +13:00
Shaun Bennett
922f2d5ee9 Merge remote-tracking branch 'origin/master' 2015-02-05 23:20:45 -05:00
Shaun Bennett
fcb3d20778 Move tablist stuff to portal, show current server on tablist 2015-02-05 23:20:39 -05:00
Chiss
14fc6f2145 Chest Update 2015-02-06 14:16:10 +11:00
Chiss
dbd6f449eb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
 2015-02-05 11:37:35 +11:00
Chiss
c7d4b14f4c Revert "Revert "Work on treasure............"" 
This reverts commit 49bfe385bf.
 2015-02-05 11:34:29 +11:00
Shaun Bennett
b0a2e655c1 Changes to IntellIJ Files 2015-02-03 14:12:52 -05:00
Jonathan Williams
49bfe385bf Revert "Work on treasure............" 
This reverts commit 50a8fb03a9.

REVERT ALL SHAUNS CRAP.
 2015-01-29 22:28:41 -08:00
libraryaddict
505dcc1e8e Add friends gui, deprecate the old chatbased friends display 2015-01-30 13:46:07 +13:00
Shaun Bennett
50a8fb03a9 Work on treasure............ 2015-01-29 18:37:29 -05:00
Chiss
7f4bcd1210 Smash Update 
new scoreboard (not implemented yet)
reward changes
 2015-01-29 11:54:59 +11:00
Jonathan Williams
08078c1622 Removed Logger 2015-01-22 23:18:38 -08:00
Shaun Bennett
c8be08e5b9 Merge remote-tracking branch 'origin/master' 2015-01-16 15:30:16 -05:00
Shaun Bennett
b395508f0e 54b7f21604c94e9ad2f53956 Flag for Poll DIsplay 2015-01-16 15:30:06 -05:00
Jonathan Williams
78cd5e7070 Changed hub to normal. 2015-01-15 00:39:07 -08:00
Jonathan Williams
c83643564b Fixed scoreboards reading from file. 
Fixed scoreboard server name length
Changed how we pull server group on startup.
 2015-01-13 12:22:47 -08:00
Jonathan Williams
ac709d09ce Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-11 00:42:55 -08:00
Jonathan Williams
8e04a2a5f2 Portal now checks server status and player's rank before sending them to a server to prevent login spam. 
Refactored portal method names.
 2015-01-11 00:42:31 -08:00
Jonathan Williams
47fc6e3b94 Revert "Added pool based repository and converted everything but account and donation repositories to it." 
This reverts commit 8de8d31eec.
 2015-01-11 00:41:40 -08:00
Jonathan Williams
8de8d31eec Added pool based repository and converted everything but account and donation repositories to it. 2015-01-10 11:53:25 -08:00
Chiss
8ce097d837 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-04 13:21:35 +11:00
Jonathan Williams
aca7fd6849 Removed all create calls 2014-12-31 09:38:41 -05:00
Chiss
5f36c8e424 minor scoreboard changes 
legend loot bonus
 2014-12-30 08:50:37 +11:00
Jonathan Williams
97f57b655b Prevent horses from spawning in Clans 
Added Building supplies shop and pvp shop to clans.
 2014-12-29 06:44:00 -05:00
Jonathan Williams
008980d9ca Slowed Server page update speed. 2014-12-24 01:36:33 -05:00
Shaun Bennett
cff63ca3e3 Phinary needs some sleep! 2014-12-23 08:07:46 -06:00
Shaun Bennett
9c1e3aa7aa Ignore full or dead servers 2014-12-23 06:26:51 -06:00
Shaun Bennett
c40a5a8eac Another bugfix 2014-12-23 06:20:36 -06:00
Shaun Bennett
582ed34d21 Fix for staff hosted 2014-12-23 05:48:45 -06:00
Shaun Bennett
5f509ca488 Rank fixes, visual fixes, lets hope things work! 2014-12-23 04:55:00 -06:00
Shaun Bennett
d8311d860e Ignore private servers 2014-12-23 04:21:37 -06:00
Shaun Bennett
c41b5b0cfb private server gui, i think? 2014-12-23 04:15:33 -06:00
Jonathan Williams
7ef2edd498 Removed extra enjin message. 
Added retrieval of servergroups to identify if server is a player server or not.
 2014-12-23 04:19:24 -05:00
Jonathan Williams
f00854ee4c Removed bad code thats bad from the bad birdy. 
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.

Updated Enjin to handle more versatile inventory purchases.
 2014-12-23 03:43:56 -05:00
Jonathan Williams
103ff0e6b0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 02:57:24 -05:00
Shaun Bennett
48fdfbb8f0 Hub changes for private servers 2014-12-23 00:30:15 -06:00
Jonathan Williams
4cac65a81f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 00:50:20 -05:00
Jonathan Williams
0e85b7e6cc Added HostName to server groups. 
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
 2014-12-23 00:49:52 -05:00
Shaun Bennett
1957db25d9 Add player head button 2014-12-22 23:20:20 -06:00
Chiss
224d1bbf63 blizzard particle redo 
hub text
 2014-12-23 10:36:48 +11:00
Chiss
98b614848d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
 2014-12-22 10:54:31 +11:00
Chiss
679f7909b0 Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers 2014-12-18 12:45:56 +11:00
Shaun Bennett
d19431a47f Rename Clicked to onClick 2014-12-17 18:40:44 -06:00
Shaun Bennett
6e42894d5c Refactor button again 2014-12-17 18:33:24 -06:00
libraryaddict
0e7adab3eb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-17 18:32:50 +13:00
libraryaddict
17ac36d9ae Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub 2014-12-17 18:31:51 +13:00
Chiss
a433ad764d Wither Morph 
Legend Particle
 2014-12-16 16:18:09 +11:00
Jonathan Williams
c43ee95c55 Added 1.8 hooks for disguise setName and getName 
Refactored method names in some disguise classes.
 2014-12-15 21:46:14 -05:00
Jonathan Williams
5b67e2182a Added disguise to Pet Manager for eventual wither disguised pet. 2014-12-14 02:30:39 -05:00
Chiss
4fd6ed80c4 final xmas Updates 
xmas hub
 2014-12-12 19:44:04 +11:00
Chiss
2be4d7d6d2 XMAS UPDATE 2014-12-12 10:03:25 +11:00
Jonathan Williams
c4fee8e681 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/.classpath
 2014-12-10 03:34:53 -08:00
Jonathan Williams
ea034812b9 Fixed path finder crap in UtilEnt 
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
 2014-12-10 03:32:35 -08:00
Chiss
0aba82eee6 fixed some eclipse java6 stuff with mail 
Christmas game update
 2014-12-10 15:38:57 +11:00
Shaun Bennett
b99da44873 Disable mail and notifications 2014-12-06 01:00:02 -06:00
Shaun Bennett
54d8fe21fb Notifications and stuffs? 2014-12-04 22:48:54 -06:00
Shaun Bennett
f48085d5ca Merge remote-tracking branch 'origin/master' 2014-12-04 17:41:40 -06:00
Shaun Bennett
0bb2d1db5b Some changes *_* 2014-12-04 17:29:47 -06:00
Jonathan Williams
59f93d46ec Refactored IButton 
Added ComplexButton

Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
 2014-12-04 05:05:27 -08:00
Jonathan Williams
abaf9f4693 Refactored IRelation method names 
Added support for negative amounts in Support server.

Clans in core testing state.
 2014-12-03 13:06:50 -08:00
Jonathan Williams
e7cf4eb51d Removed use of Gem Boosters 
Cleaned up some unused imports.
 2014-12-01 02:27:39 -08:00
Jonathan Williams
f507db7664 Reworked spawn to save to database. 
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
 2014-11-29 03:16:37 -08:00
Shaun Bennett
cded2c7d8f Update Polls to use new MiniDbClientPlugin 2014-11-26 12:07:06 -06:00
Shaun Bennett
7c9226d6de Fix mail to work with recent changes 2014-11-26 11:55:28 -06:00
Shaun Bennett
c73a9f3bd5 Merge remote-tracking branch 'origin/master' 2014-11-26 11:39:13 -06:00
libraryaddict
9928811a71 Merge pull request #2 from Better-Holograms to master 
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
  Remove the 'Made by Shaun'
  Fix up mistakes in the previous modifications
  You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
  Ignore wither skulls for CustomTagFix
  Remove old holograms and add new holograms
 2014-11-26 06:07:57 -06:00
libraryaddict
ef59cb7a9d Merging changes from master to Better-Holograms 
* master:
  Antistack replacement

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-11-27 01:01:19 +13:00
libraryaddict
03075fecae You have your HologramManager presented in a light most fair. 
Should be worth noting I didn't test it thoroughly
 2014-11-26 10:28:37 +13:00
Jonathan Williams
484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Jonathan Williams
3b54789767 Optimized logins dealing with mysql with multiqueries. 
Added lazy loading of Pool data and Loaded check before performing anything.

Refactored MiniClientPlugin and created MiniDbClientPlugin

Renamed RankBenefitManager9000 to BenefitManager

Removed /send ability for now.
 2014-11-25 13:25:13 -08:00
Shaun Bennett
f1fbc21570 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2014-11-23 20:02:09 -06:00
Shaun Bennett
c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Jonathan Williams
6efa416d81 Fixed glitching dom items in Hub due to portal throw. 2014-11-21 18:30:26 -08:00
Jonathan Williams
6c63552480 Refactored RankBenefitsGiver9000 
Added Thanksgiving benefits (1 treasure key).

ServerMonitor now ignores Testing group.
 2014-11-20 21:24:23 -08:00
Shaun Bennett
a73ee4e306 Structure for Mail system, not finished yet. 2014-11-20 14:41:25 -06:00
Chiss
972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08:00
Chiss
2384b91b06 game timer > advertisement 2014-11-16 14:45:18 +11:00
Jonathan Williams
2e58342032 Removed MS from beta. 2014-11-15 19:27:37 -08:00
Chiss
ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Jonathan Williams
1372f74921 Refactored some names in MiniPlugin 
Work on clans.
 2014-11-12 19:21:12 -08:00
Chiss
c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Jonathan Williams
3309c0406b Added ∞ for admin/owners as player level. 
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
 2014-11-07 13:54:11 -08:00
Chiss
c93862f299 updated player level 
added /givestat command for owners (must use full string; Global.ExpEarned)
 2014-11-07 22:10:41 +11:00
Chiss
fadaa59526 added mineplex level 
removed ability to go into negative gems as villager morph
 2014-11-07 19:20:15 +11:00
Chiss
a67842b504 returned hub to normal 
removed flaming pumpkins from arcade
 2014-11-07 12:54:38 +11:00
Jonathan Williams
f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams
6f2a6a6ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-05 14:45:54 -08:00
Jonathan Williams
1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Chiss
b00fb0952a Updated Sheep Quest to be 1.8 comptible. 
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
 2014-11-05 11:26:39 +11:00
Shaun Bennett
a2f7a84120 Fix Hub Rule Book 2014-11-03 18:46:49 -06:00
Jonathan Williams
fa0049d22a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-31 23:01:15 -07:00
CoderTim
f3770933b6 Merge branch 'feature/database-pool' 2014-11-01 01:59:07 -04:00
Jonathan Williams
45da22b0bf Fixed bug with parkour enchantment checks. 2014-10-31 17:03:06 -07:00
Chiss
b5ef46007f updated npc info 2014-10-31 18:17:12 +11:00
CoderTim
4fc291ea80 Everything but Mineplexer using database pool 2014-10-29 18:43:21 -04:00
CoderTim
5244f65d8f All connections to db.mineplex.com/Account use database pool 2014-10-29 17:54:40 -04:00
CoderTim
f0ba562265 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-27 18:11:29 -04:00
CoderTim
9f8b119fb7 Bug fixes 2014-10-27 18:09:23 -04:00
Chiss
bd2e7faf3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-25 13:40:53 +11:00
Chiss
4002528c51 Updated GUI text. 
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
 2014-10-25 13:40:34 +11:00
Jonathan Williams
6f541a8d30 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-24 18:00:18 -07:00
Jonathan Williams
04ba68293e Removed debug. 2014-10-24 18:00:10 -07:00
Chiss
01f311a3d6 Added missing requirements for SG Achievement Kit 
fixed a parkour exploit
 2014-10-25 10:38:47 +11:00
Chiss
25fc3c0645 Achievement Kits (3 games) 
Halloween Pumpkins
Youtube command (allows kits)
 2014-10-24 19:05:57 +11:00
Chiss
d4512e464a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-23 14:05:54 +11:00
Chiss
c2bb53c887 Halloween pumpkins 
Minestrike balance
bug fixes
 2014-10-23 14:05:35 +11:00
Jonathan Williams
8630a1ba4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 23:39:21 -05:00
Jonathan Williams
e3cd6f0e69 Fixed Mem leak in CustomTagFix 
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
 2014-10-17 23:29:24 -05:00
Chiss
075bc0af1d Added gem rewards for MS achievements 2014-10-17 21:20:04 +11:00
Jonathan Williams
98ffa53128 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 03:34:47 -05:00
Chiss
752537b0f6 missing hubtype 2014-10-17 18:59:04 +11:00
Jonathan Williams
2bbb29c8bb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 02:57:30 -05:00
Chiss
f5efea1e9a Missing files 2014-10-17 18:34:23 +11:00
Jonathan Williams
6d38f4e238 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 00:42:01 -05:00
Jonathan Williams
8466b8e2dd Fixed building issues with EnjinTranslator 
MAde mysql repo always record rank change even if windows return rank is different.
Added rough single player replay functionality.
 2014-10-17 00:41:23 -05:00
Shaun Bennett
ec81e9f511 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
 2014-10-16 17:51:32 -05:00
Chiss
5db2c072a0 Halloween update 2014-10-16 16:27:09 +11:00
Shaun Bennett
58f69b49d7 Add new chat features to JsonMessage 2014-10-15 11:11:32 -05:00
Shaun Bennett
e732523dcd Merge remote-tracking branch 'origin/master' 2014-10-15 10:31:45 -05:00
Chiss
b83b0e61e6 fixed long lines in achievements 
added night to halloween maps in parser
 2014-10-15 16:57:25 +11:00
Chiss
eb5af41323 Added halloween reward pet 
minor bug fixes
 2014-10-15 15:44:26 +11:00
Shaun Bennett
130b932f40 Fix typo in Free Server Timer 2014-10-14 14:30:44 -05:00
Chiss
ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
Chiss
a4b85053d9 fixed bug where blockmorph was crashing hubs. 2014-10-13 14:56:19 +11:00
Jonathan Williams
3e92b02bab Fixed max slot bug with ultra/hero 2014-10-11 05:56:47 -07:00
Chiss
1d3b792ed8 UHC head apple fixes 2014-10-11 23:09:56 +11:00
Jonathan Williams
d407cc7c4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:57:01 -07:00
Chiss
95a4a34b47 UHC announcement Title 2014-10-11 20:55:48 +11:00
Jonathan Williams
8ace0ce07c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:55:45 -07:00
Chiss
316ce38056 Changed Utility time to ms 2014-10-11 20:53:39 +11:00
Jonathan Williams
797dd002ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:43:56 -07:00
Jonathan Williams
1a10ddb6a4 Fix for Open in 2014-10-11 02:43:02 -07:00
Jonathan Williams
a54b78fefa Added Mine-Strike to Quick Game menu. 
Fixed up CoreClientManager's rank update.
 2014-10-11 02:32:02 -07:00
Chiss
a7ceb24b15 Hub UHC time log 2014-10-11 20:10:48 +11:00
Chiss
dc0709f17e HH Update 
Added UHC to skytext for hub
 2014-10-11 19:43:28 +11:00
Jonathan Williams
19afebe53d Added in mysql hooks for coins/gems/ranks for database conversion preperation. 
Added in failover database calls in CoreClient/DonationManager
 2014-10-11 01:32:22 -07:00
Chiss
e3747b5183 Minestrike fixes 
Hub UHC announcer
 2014-10-10 13:07:59 +11:00
Chiss
8701f9ddcc Added TabTitle 
Converted MineStrike to use scoreboard name hiding
 2014-10-09 10:35:54 +11:00
Jonathan Williams
9033843a31 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-03 01:50:35 -07:00
Jonathan Williams
c641eab3c7 Fixed up friends. 2014-10-03 01:50:23 -07:00
Chiss
17e34e2060 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-03 10:49:42 +10:00
Chiss
31ceaad7fe MineStrike audio update 2014-10-03 10:49:26 +10:00
Jonathan Williams
9b2a2cbbd6 Fixed mounting blocks on yourself in 1.8 
Added temp fix so 1.8 players can ride dragons again.
Removed Block form in parkour and fly for block form.
 2014-10-01 02:12:11 -07:00
Jonathan Williams
c2b84cc60f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-30 12:20:14 -07:00
Shaun Bennett
c7d34e70ef Merge remote-tracking branch 'origin/master' 2014-09-29 17:42:13 -05:00
Shaun Bennett
92f8dc7f61 Add velocity toggle for mod+ 2014-09-29 17:17:02 -05:00
Shaun Bennett
7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
Jonathan Williams
34baa8eafb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 23:27:19 -07:00
Jonathan Williams
8bca23f0ba Fixed bug with custom tag fix :P 
Fixed bug with server group up time check in servermonitor.
 2014-09-25 23:27:08 -07:00
Chiss
895878ee40 Removing old items, fix for a larger problemo 2014-09-26 09:33:12 +10:00
Jonathan Williams
a54a2aadc0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-24 01:32:03 -07:00
Jonathan Williams
d32085f05b Removed tab list stuff for friends. 
Implemented rudimentary friends chat list.
removed unused code in server stuff.
Added null check for retrieving server statuses.
 2014-09-24 01:31:56 -07:00
Chiss
969c7c0fde Music gadget fixes 
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
 2014-09-24 15:46:55 +10:00
MrTwiggy
5c9ee3e79e Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers. 2014-09-21 20:42:47 -04:00
Chiss
be3e10a412 Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind. 2014-09-20 09:31:06 +10:00
Chiss
9bbac7578e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-20 08:29:06 +10:00
Jonathan Williams
960b0aa69e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-19 09:23:52 -10:00
Shaun Bennett
ed85779876 Fix Treasure painball gun issue, fix parkour paintbull gun issue 2014-09-19 14:18:23 -05:00
Jonathan Williams
96498af626 Fixed parkour bug with gadget blocks. 
Removed a ton of debug messages with inventory close.
 2014-09-19 09:06:42 -10:00
Jonathan Williams
d0edde9dbd Added rank benefit giver 9000 
Added MineStrike to beta timer.

Updated official craftbukkit.jar
 2014-09-19 02:57:35 -10:00
Jonathan Williams
239b021b0d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-18 22:03:49 -10:00
Jonathan Williams
18f2ef7564 Re-enabled SNAKE PARKOUR for hub. 2014-09-18 22:03:23 -10:00
Chiss
91037384f9 Loot tweaks 
Music fixes
some bug fixes
 2014-09-19 18:01:38 +10:00
Chiss
ed7eeab1a7 fixed exception 2014-09-19 16:13:11 +10:00
Chiss
01a6ff6069 costume reward fix 
hub builder including database
 2014-09-19 13:01:49 +10:00
Shaun Bennett
aad3d59177 Merge remote-tracking branch 'origin/master' 2014-09-18 21:03:59 -05:00
Shaun Bennett
5d643c00d5 treasssssurreeeeees 2014-09-18 21:03:46 -05:00
Chiss
4b602c1b83 Inventory Update 
added Jooq to Hub build
 2014-09-19 10:36:41 +10:00
Shaun Bennett
51ad6d8368 Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes 2014-09-18 17:33:05 -05:00
Jonathan Williams
c7e0ebefd1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-13 20:52:13 -10:00
Jonathan Williams
a395cae764 Fixes for Custom tag 
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney

Added build files for arcade.
 2014-09-13 20:50:27 -10:00
Chiss
f3df86a5a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-14 14:10:51 +10:00
Chiss
7e3b9b4b3a some 1.8 title stuff 2014-09-14 14:10:40 +10:00
Jonathan Williams
4f5430e390 Added tournament stuff. 2014-09-12 21:52:44 -10:00
Jonathan Williams
a196e43fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
 2014-09-12 19:46:19 -10:00
Shaun Bennett
5e9cbcef75 Merge remote-tracking branch 'origin/master' 2014-09-12 23:15:58 -05:00
Shaun Bennett
71f42c6e7b Treasure updates 2014-09-12 23:15:53 -05:00
Chiss
e511df4605 Merge treasure 2014-09-13 13:41:37 +10:00
Chiss
e36f843feb Fixed bug in MineStrike 2014-09-13 12:29:35 +10:00
Chiss
f0fa3469df Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-13 09:17:50 +10:00
Chiss
58f784187b UHC Manager for Hub 2014-09-13 09:13:46 +10:00
Jonathan Williams
14c4152248 Fixed CustomTagFix. 
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
 2014-09-12 10:03:33 -10:00
Shaun Bennett
dea6c98fc9 Merge remote-tracking branch 'origin/master' 2014-09-12 14:08:22 -05:00
Shaun Bennett
4ea786a1a5 Fix fireworks for 1.8 client, a bunch more treasure stuff 2014-09-12 14:08:10 -05:00
Chiss
5de59b6e0e Hub UHC countdown basics 
UHC MOTD timer stuff
 2014-09-12 18:06:51 +10:00
Shaun Bennett
b910c5098c Cross version Holograms (Alignment might be a tad off) 
A bunch of stuff for Treasure Chests
 2014-09-10 12:16:31 -05:00
Jonathan Williams
d01529a344 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2014-09-05 04:38:23 -07:00
Jonathan Williams
1c6790b611 Fixed for DisguiseManager 
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
 2014-09-05 04:36:01 -07:00
Chiss
b691b1bad0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-05 12:51:59 +10:00
Chiss
f6ce9abed8 Minestrike 
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
 2014-09-05 12:28:29 +10:00
Jonathan Williams
b28fc8ee6b Added custom name tag fix for mobs for 1.8 players 
Worked on boss bar display.
Bug with <=50% hp.
 2014-09-04 11:33:51 -07:00
Shaun Bennett
e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams
92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
 2014-09-03 03:47:15 -07:00
Jonathan Williams
a4871b5509 Updated to latest spigot with 1.8 support. 
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
 2014-09-03 03:46:24 -07:00
Shaun Bennett
4dbe7003b2 Update Arcade Icon in the game menu 2014-09-02 21:09:12 -05:00
Shaun Bennett
08e6b73b1f Disable Treasure stuff for now 2014-09-02 19:04:43 -05:00
Shaun Bennett
5905ef5ef7 Treasure Stuff 2014-08-30 14:27:11 -05:00
Jonathan Williams
b07670f6af Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:04:32 -07:00
Jonathan Williams
1bd0209b39 Added multi-server tags for npcs 
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
 2014-08-30 02:04:04 -07:00
Chiss
2c30cc3ef4 Implemented new servers flags 
Removed OP from Admisn in HUB, gave them /gm command instead
 2014-08-30 16:33:56 +10:00
Chiss
41daba98c4 Background work for Minestrike 
Admins no longer have OP in hubs. They have /gm command to gamemode.
 2014-08-29 18:21:08 +10:00
Jonathan Williams
fa56aa0843 Fixed regular players not able to join Beta servers. 2014-08-28 14:02:55 -07:00
Jonathan Williams
5281558cdb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-28 14:01:49 -07:00
Jonathan Williams
409e2c6141 Tweaked menus for quick game, Cosmetic menu. 
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
 2014-08-28 14:01:37 -07:00
Chiss
ec4cb91a1c Poll changes 
Achievement output double space fix
 2014-08-28 11:50:09 +10:00
Shaun Bennett
b67e127902 Merge remote-tracking branch 'origin/master' 2014-08-27 14:08:47 -05:00
Shaun Bennett
573f71164f Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking 2014-08-27 14:07:22 -05:00
Chiss
4e43a2ca73 Extended range of snake parkour, ensuring people tp back to it when they fall. 2014-08-27 15:19:08 +10:00
Chiss
da5f953212 Fixed BlockMorph leaving blocks behind when player was teleported. 2014-08-27 14:22:35 +10:00
Shaun Bennett
b508cd036c Lazy fix so that polls award gems instead of coins 2014-08-26 18:36:40 -05:00
Jonathan Williams
5fdf466722 Fixed bug in server monitor. 
re-enabled animal spawn in hub.
 2014-08-26 02:02:31 -07:00
Jonathan Williams
526b5c333a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4 Added Gem booster use. 2014-08-26 00:33:48 -07:00
Chiss
1b15a57fc8 Added Gem Rewards for Achievements 2014-08-26 17:10:20 +10:00
Jonathan Williams
162a86d4b2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
 2014-08-25 23:58:54 -07:00
Jonathan Williams
b8b6c031cd Re-did and added a game to the quick game menu. 
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
 2014-08-25 23:56:58 -07:00
Chiss
1b3e32ca26 Added Arcade Achievements 2014-08-26 14:42:17 +10:00
Chiss
28d523d696 Added Achievements 2014-08-26 13:42:42 +10:00
Chiss
07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
Chiss
0e3cf67402 Some new cosmetics 2014-08-25 12:59:29 +10:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Shaun Bennett
ff441f2262 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Jonathan Williams
70beb58bd6 Enabled debugging in Hub/Arcade 2014-08-23 01:49:48 -05:00
Jonathan Williams
931cb5ece8 Removed MineKart code. 
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
 2014-08-23 00:40:07 -05:00
Jonathan Williams
3a47a161c5 Enabled snake parkour 
Updated servermanager/serverNpcPage to handle free and beta timers.
 2014-08-22 22:53:15 -05:00
Chiss
e40cb17e47 Updated tutorial locations 2014-08-23 08:52:50 +10:00
Chiss
e5944ff872 Spawn location fix 2014-08-23 08:40:02 +10:00
Chiss
9fad775f73 More cosmetics 2014-08-23 07:50:07 +10:00
Chiss
a159f04d50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 04:30:52 +10:00
Chiss
231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams
83b3e49151 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 10:48:27 -05:00
Jonathan Williams
70217fe957 Finished first release of Customer Support plugin. 2014-08-22 10:47:46 -05:00
Chiss
97c087a28d Allowed commands to specify specific ranks 
allowed youtube/build to start/set games
 2014-08-22 17:05:14 +10:00
Jonathan Williams
830eeca835 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-20 20:14:32 -05:00
Jonathan Williams
315da32518 Removed unused code in Party 
Fixed path var in Core.Common
 2014-08-20 20:14:23 -05:00
Chiss
60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Jonathan Williams
217ab51b40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 22:24:16 -05:00
Shaun Bennett
a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Shaun Bennett
f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
Jonathan Williams
24f984a365 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 21:37:11 -04:00
Jonathan Williams
9ee25c6292 Did some cleanup in Pvp project. 
Did work in Coreclient manager and added StaffServer (still in progress)
 2014-08-19 21:36:23 -04:00
Chiss
94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Chiss
7535f39d18 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-20 10:39:58 +10:00
Chiss
afea0ba87f Parser Merge 2014-08-20 10:39:41 +10:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Shaun Bennett
b99e9d3f70 Simplified poll system, derp 2014-08-18 14:15:32 -05:00
Shaun Bennett
36d5c2c3af Don't add player's current poll to the queue 2014-08-17 18:11:55 -05:00
Shaun Bennett
34ffc06166 Add functionality to skip polls 2014-08-17 18:07:16 -05:00
Shaun Bennett
6e9d2b3244 Allow setting a time when it should poll again 2014-08-17 17:53:38 -05:00
Shaun Bennett
43fd604695 Queue up polls for players instead of constantly checking for next poll 2014-08-17 17:47:38 -05:00
Shaun Bennett
4ba7da9a54 Polls! Still needs tweaks 
Hub artifact stuff for IntelliJ
 2014-08-17 17:30:35 -05:00
Jonathan Williams
8aec9e345e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-16 01:37:17 -05:00
Chiss
d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Jonathan Williams
f98dc0c66d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-15 23:03:34 -05:00
CoderTim
19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
Jonathan Williams
3f827a310a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-15 11:54:19 -05:00
Jonathan Williams
efdaa21ae7 Proper cleanup on lobby menu update. 2014-08-15 11:52:57 -05:00
Chiss
697897b967 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-15 09:49:12 +10:00
Chiss
85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +10:00
Jonathan Williams
846c75453c Revamping Redis Server status so it uses a consistent time value from redis database. 2014-08-14 07:41:04 -05:00
Jonathan Williams
6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Jonathan Williams
5618a3edad Removed extra free version generator in server monitor. 2014-08-12 13:00:17 -05:00
Ty
36d6a58e0a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
 2014-08-11 15:39:56 -04:00
Chiss
7191d48bd0 fixed paintball pre-game bug 2014-08-11 14:25:11 +10:00
Jonathan Williams
f15e539841 Added showing of only 3 full servers in server menu. 2014-08-09 09:40:59 -05:00
Chiss
a43a5b2c0e bacon brawl fix 
signel game ultra shows in hub scoreboard
 2014-08-10 00:09:39 +10:00
Jonathan Williams
0cdfda7765 Fixed message on free timer. 2014-08-09 08:08:24 -05:00
Chiss
a34ce75252 price fix 2014-08-09 22:02:40 +10:00
Jonathan Williams
8fe4e39207 Split up Cosmetic shop and Inventory 
Added Ammo purchase for item gadgets.
 2014-08-09 03:57:56 -05:00
Jonathan Williams
4e93707f0d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 00:06:53 -05:00
Jonathan Williams
0de8d22e62 Changed invis in hub to only be on server npc shops 
Fixed /a for senior mods and developers.
 2014-08-09 00:06:44 -05:00
Chiss
91a79f0345 Pig Morph 
Morphs have tags/
 2014-08-09 14:57:01 +10:00
Chiss
97cf02eb37 Hub changes 2014-08-09 12:35:36 +10:00
Chiss
313f675ae4 Hub Parkour update 
Smash kit prices
 2014-08-09 12:16:37 +10:00
Ty
ecb0b2d3bb Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL. 2014-08-08 17:35:37 -04:00
Chiss
02dd579844 Text change for Inventory Menu 2014-08-08 17:16:20 +10:00
Jonathan Williams
e1be732202 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
 2014-08-08 02:07:20 -05:00
Jonathan Williams
9f2a83c956 Added Coins to donation. 
Fixed order of gadgets, mounts, pets, morphs, particles.
Fixed display of active pet in Menu
Fixed coins purchase for most items.

Added Coins reward for ENjinTranslator.
Added Coin transactions.
 2014-08-08 02:05:58 -05:00
Chiss
fa3695be4e Gem Booster In Lobby 
Achievement Stuff
 2014-08-08 17:05:11 +10:00
Jonathan Williams
5d89d1f728 Fixed gadget adding/removing from hotbar 
Fixed stats manager _stats not initializing
Optimized saving call.
 2014-08-07 01:46:10 -07:00
Jonathan Williams
2a31bbee95 Added new gadget stuff to core. 
Hooked up particle page.
 2014-08-07 01:20:19 -07:00
Jonathan Williams
c01fbd279d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
 2014-08-07 00:48:32 -07:00
Jonathan Williams
6d86f403ac Added coins Currency to web api 
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager

Redesigned gadgets/morph/particle/pets/mounts page and inventory.
 2014-08-07 00:33:24 -07:00
Chiss
0317795a04 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-07 17:31:01 +10:00
Chiss
dc1a37a92e Gadget STuff 2014-08-07 17:30:46 +10:00
Shaun Bennett
04487fae3e Only show 5 open servers on Server Gui 2014-08-06 21:31:53 -05:00
Shaun Bennett
0b942e5180 Stop DragonMount from causing the news bar to flicker 2014-08-06 21:03:48 -05:00
Chiss
c647e6b48d Missing morphs 
Bacon brawl knockback increase over time
Parse color error fix
 2014-08-07 09:47:11 +10:00
Chiss
c8dfb2f02e Parser Fixes 
Sneaky Stuff
 2014-08-06 11:07:49 +10:00
Ty
1b7c762942 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
 2014-08-04 18:47:49 -04:00
Shaun Bennett
69b709b3ab Change clock timer to be 35 seconds 2014-08-03 13:28:56 -05:00
Shaun Bennett
69aa881ba2 Remove reference to server split in clock text 2014-08-03 13:27:04 -05:00
Shaun Bennett
db61a10c7f Remove server split from server selection pages 
Select any server with portals
 2014-08-03 13:24:13 -05:00
Jonathan Williams
cb1a466a5b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-02 03:01:53 -07:00
Jonathan Williams
51faf5cd15 Reduced free timer. 2014-08-02 03:01:36 -07:00
Ty
6a9255e97b Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes. 2014-08-01 17:56:29 -04:00
Shaun Bennett
232088cd55 Make sure servers are in progress before counting them 2014-08-01 03:57:34 -05:00
Jonathan Williams
b056733ba1 Removed duration code and replaced with 60000L 2014-08-01 00:09:35 -07:00
Jonathan Williams
53ce70488f Merge pull request #1 from premium-server-menu to master 
* commit '95a45409a98c141a115e463e56e440b204ae2029':
  Use UtilPlayer and F.main for messaging
  Fix flashing clock (oops!)
  Sound effects and knockbacks!
  Flashing wool instead of clock for the timer
  Change duration of timer. Don't punish a party if the leader has ultra
  Lighten load on our servers, not free servers!
  Lore edit on clock item
  Place players on correct server corresponding to their rank via portals
  Visual clock update
  Fix lore messages not displaying correctly under certain circumstances
  Use constants for lore messages on server page
  Prevent free players from joining servers before time limit
  Deny joining Premium servers through server command without premium
  Fix "Click to Spectate" formatting
  Identify free servers from server name
  Add Server Menu for Premium Servers. Item lore still needs some work
 2014-08-01 02:05:39 -05:00
Shaun Bennett
95a45409a9 Use UtilPlayer and F.main for messaging 2014-08-01 01:43:50 -05:00
Jonathan Williams
eae4bed630 Removed unused ServerManagerUpdater.java 
Tweaked ServerMonitor to handle Free/Premium
 2014-07-31 23:37:39 -07:00
Shaun Bennett
15d48d2867 Fix flashing clock (oops!) 2014-08-01 01:25:11 -05:00
Shaun Bennett
fbe6ab2fdb Sound effects and knockbacks! 2014-08-01 01:22:01 -05:00
Shaun Bennett
fd01b4933b Flashing wool instead of clock for the timer 2014-08-01 00:39:38 -05:00
Shaun Bennett
6b18fdf396 Change duration of timer. Don't punish a party if the leader has ultra 2014-08-01 00:38:26 -05:00
Shaun Bennett
ccf5893051 Lighten load on our servers, not free servers! 2014-08-01 00:04:12 -05:00
Shaun Bennett
5ea6eaeb9e Lore edit on clock item 2014-08-01 00:03:26 -05:00
Shaun Bennett
c01e9abf29 Place players on correct server corresponding to their rank via portals 2014-07-31 23:56:51 -05:00
Shaun Bennett
7d1da7114f Visual clock update 2014-07-31 23:49:52 -05:00
Shaun Bennett
cf724272dd Fix lore messages not displaying correctly under certain circumstances 2014-07-31 17:30:02 -05:00
Shaun Bennett
41128cbc9d Use constants for lore messages on server page 2014-07-31 17:17:05 -05:00
Shaun Bennett
4c74ce60eb Prevent free players from joining servers before time limit 2014-07-31 15:36:00 -05:00
Shaun Bennett
b93d6b9cb1 Fix "Click to Spectate" formatting 2014-07-30 17:44:09 -05:00
Shaun Bennett
3e9aebdb87 Identify free servers from server name 2014-07-30 17:30:46 -05:00
Shaun Bennett
dcc8eaaa21 Add Server Menu for Premium Servers. Item lore still needs some work 2014-07-30 17:19:51 -05:00
Jonathan Williams
f235f67aa5 Added +20 player buffer for lobbies. 2014-07-29 21:11:07 -07:00
Peter Miller
d7037f1619 Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase. 2014-07-22 22:18:29 -04:00
Peter Miller
e8d4ab2517 Re-enabled News commands after adding check to "Reset newsIndex if outside of bounds of news array after RefreshNews but before UtilTime.elapsed" in NewsManager.java 2014-07-21 18:06:33 -04:00
Jonathan Williams
5bc7549b8c Disabled news because of console errors. 2014-07-19 14:48:05 -07:00
Jonathan Williams
fc43f434f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-19 13:56:30 -07:00
Jonathan Williams
2ae3d89496 Fixed issue with RepositoryBase and Friend/MysqlRepo 
Each db call on login gets its own async after the first two account calls are finished.
 2014-07-19 13:56:03 -07:00
Peter Miller
944e7fca40 Finalizing BONUS clickable text hover text and News Entry issue overall. 
Fixing bug with "/news set" command with insufficient command arguments.
 2014-07-16 18:49:49 -04:00
Peter Miller
d9110b4e3b Implementing BONUS: Clickable Chat Links. 2014-07-15 22:31:53 -04:00
Jonathan Williams
cb4d436605 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-14 22:58:58 -07:00
Jonathan Williams
1207ed8199 Added DDOSProtectionSwitcher email functionality 
mineplex.core.Server cleanup.

Refactored RepositoryBase.

Implemented core functionality of Friends
 2014-07-14 22:58:36 -07:00
Peter Miller
2ec8371f98 Implementing /news add and delete commands. 2014-07-10 21:10:35 -04:00
Peter Miller
82ba7bf30f Implementing /news list and set commands. 2014-07-09 20:38:11 -04:00
Jonathan Williams
65b2e14689 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-09 11:15:06 -07:00
Jonathan Williams
193bd82b61 Minor adjustment to rule book. 2014-07-09 11:14:57 -07:00
Peter Miller
f38af4ab8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 22:56:02 -04:00
Peter Miller
58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Jonathan Williams
74817f5f2e Added rule book to Hub. 
Fixed mineplexer bungee internet status.

Fixed up ddosprotectionswitcher.
 2014-07-08 18:01:03 -07:00
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Jonathan Williams
ff8c506690 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 23:23:30 -07:00
Mini-Chiss
ce8560bdbf hub news 2014-07-04 23:20:46 -07:00
Jonathan Williams
c265c7ce5c Fixed sync db Logger.java 
Added temp test code in player tracker...ignore.

fixed bug in dynamic server sorter.
 2014-07-04 14:23:11 -07:00
Jonathan Williams
d0fafce585 Reverted change to helper only joining full, now ultras can. 
Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
 2014-07-02 16:59:31 -07:00
Jonathan Williams
8eaad57516 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-02 16:05:37 -07:00
Jonathan Williams
f1393ffb33 Fixed rankUpdate changing existing higher ranked players. 
Fixed join limits in arcade and hub.
 2014-07-02 16:05:26 -07:00
Mini-Chiss
82dd94de9b Scoreboard fix 
Unbreakable boats in hub
 2014-07-02 12:50:04 -07:00
Peter Miller
6c67ff9106 Resolving issues from Portal.java conflict resolution 2014-07-02 04:09:41 -04:00
Jonathan Williams
6fd889d8fc Added Player mapping. 
Removed joining full servers for ultra.
 2014-07-01 18:31:17 -07:00
Jonathan Williams
b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams
9fd3f14248 Added RankUpdate command. 
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
 2014-07-01 10:23:22 -07:00
Mini-Chiss
8c461b3e1b Cooldown on Spec Compass 
Hub Forcefield Update
Scoreboard MINEPLEX refactor
 2014-06-30 16:12:42 -07:00
Jonathan Williams
7ff3765ba4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 22:11:14 -07:00
Chiss
9a79d0ede7 Fixed CME 
Gadget cost fix
MapParser fix
 2014-06-15 15:10:19 +10:00
Jonathan Williams
04236939d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 21:27:42 -07:00
Jonathan Williams
26e16e8eac Added button file. 2014-06-14 21:27:33 -07:00
Jonathan Williams
264248ecfa Added castle siege quick join menu button. 2014-06-14 21:27:21 -07:00
Chiss
1bfa24cc45 Fixed Fireworks crash bug & portal destroy bug; 
-Only livingentities bounce off portals
-Fireworks cannot be used near portals
 2014-06-15 12:35:09 +10:00
Chiss
2170f743dd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-06-13 08:42:57 +10:00
Jonathan Williams
be8fea8ca9 Changed Chat API key. 
Fixed PreferenceManager not saving asynchronously.
 2014-06-12 08:02:47 -07:00
Chiss
0be4df4531 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-11 12:14:45 +10:00
Chiss
6a1ffcd3b7 Fixed some gadget stuff 2014-06-11 12:14:21 +10:00
Jonathan Williams
4fca244812 Made ItemGadgets Free. 
Removed queue dom shop.
 2014-06-10 02:00:53 -05:00
Jonathan Williams
3ae119d88a Fixed hub package unlock bug. 
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
 2014-06-08 11:27:14 -05:00
Chiss
a8dda4ef8b Hub Gem Queueing 2014-06-04 13:02:16 +10:00
Chiss
f2d1709adb Hub update 2014-06-01 18:18:58 +10:00
Chiss
040ffe0ae5 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-06-01 17:56:27 +10:00
Chiss
c2ce84c666 merge 2014-06-01 17:56:15 +10:00
Jonathan Williams
11862f672e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2014-06-01 00:54:15 -07:00
Jonathan Williams
d0e9c41e22 Added moved pet stuff. 2014-06-01 00:53:15 -07:00
Jonathan Williams
bd2804c0d6 Fixed some item slot numbers for gadgets. 2014-06-01 00:53:00 -07:00
Chiss
2a5f3c4502 antistack 2014-06-01 17:47:11 +10:00
Jonathan Williams
461e1023e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-06-01 00:39:28 -07:00
Jonathan Williams
f157715174 Merged Pet page into Gadget page. 
Reworked gadget page.
 2014-06-01 00:39:10 -07:00
Chiss
37c5654e13 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2014-06-01 15:50:11 +10:00
Chiss
a3a3a87278 Hug update 2014-06-01 15:47:34 +10:00
Jonathan Williams
7f87043f7b Removed unused buttons. 
Fixed pref inv placement.

Refactored queue code so its not stupid.

Fixed issue with queuer.
 2014-05-31 22:46:43 -07:00
Jonathan Williams
6505819a4b Removed chat filtering. 
Implemented user preferences in all required modules.
 2014-05-30 13:34:55 -07:00
Jonathan Williams
57c3845df9 Finished up preferences. 
Each preference saves, loads on login.
GUI working great.
 2014-05-30 01:42:43 -07:00
Jonathan Williams
6c9a2d0a01 Hooked up preference manager to Chat. 2014-05-30 00:33:55 -07:00
Jonathan Williams
77f6aac860 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-30 00:26:34 -07:00
Jonathan Williams
b8908ada4b Removed unused connection info in RetrieveClientInformationEvent 
Added required method for miniclientplugin
Implemented Preferences module...repo/manager/gui
 2014-05-30 00:25:48 -07:00
Chiss
937f5d8ef2 Hub stuff 2014-05-30 17:17:53 +10:00
Jonathan Williams
c38e60456b OMG THIS THING IS SO COMPLICATED MY BRAIN FIZZZLED...fixed some queuer issues. 
Fixed bug with forcefield in hub.

Fixed symbol for connecting to dbs in connection strings.
 2014-05-29 19:47:57 -07:00
Jonathan Williams
d5ea6c5377 Removed dead project ServerStatus 
Tweaked connection strings so they autoreconnect.

Added dragon sound to pre-queue prompt.

Added rest of missing files.
 2014-05-28 11:18:30 -07:00
Jonathan Williams
449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	.gitignore
 2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer. 
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
 2014-05-27 02:10:29 -07:00
CoderTim
49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim
3859a42f1d Removed broken and obsolete shifter code 
Set up more intellij stuff
 2014-05-25 19:11:58 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams
40ba1a64f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 14:46:15 -05:00
Chiss
97abe79ffa armorgadgets disable fix 2014-05-13 12:23:29 +10:00
Chiss
8c3deeba49 Hub Commands (/forcefield and /gadget) 2014-05-13 12:08:56 +10:00
Jonathan Williams
8ee52be8da Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-08 20:01:31 -07:00
Jonathan Williams
eae2d41fad Fixed party out of bounds exception. 
Fixed tnt in wrong place in dom shop.
 2014-05-08 20:01:21 -07:00
Chiss
56ae8627f5 news changes 2014-05-09 12:58:29 +10:00
Jonathan Williams
ebf40afe75 Fix dom bow shoot in lobby bug. 
Work on preventing illegal builds.
 2014-05-06 22:38:27 -07:00
Jonathan Williams
f4a92ec07a Implemented Logger 
Logger now catches all uncaught exceptions and logs them to DB.

Put in some preventative checks in Hub/Party as they threw a lot of the same errors.

Added autoreconnect to AntiHack as it was spamming errors in DB
 2014-04-30 10:57:19 -07:00
Jonathan Williams
7637d94ae0 Added mysql logger. 
Hooked it up in a few places.

Fixed Asynch crap with AntiHack.
 2014-04-30 00:31:22 -07:00
Jonathan Williams
e958a922fe Fixed Hub chat so it goes through filter. 
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
 2014-04-29 12:53:22 -07:00
Jonathan Williams
3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -07:00
Chiss
c5509f870f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-28 09:43:18 +10:00
Chiss
40ef432211 Cannot use skills/items in HubManager 
Dom CP score rate lowered
Dom items dont use energy
 2014-04-28 09:41:00 +10:00
Jonathan Williams
7c9017f184 Fixed Bungee issue with ServerPing in MOTD. 
UPdated to latest spigot again.

Removed useless 1.7 stat tracking.

Fixed Party issue in hub
 2014-04-26 02:47:04 -07:00
Jonathan Williams
a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -07:00
Jonathan Williams
9136fa0b15 Upgraded to latest spigot. 
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
 2014-04-25 00:44:14 -07:00
Chiss
8229925fca HUB NEWS 2014-04-25 17:37:42 +10:00
Jonathan Williams
0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams
bedabd84cc Added silence to kits (UtilEnt.silence) 
Cleaned up a ton of unused code....
 2014-04-08 23:31:32 -07:00
Chiss
85c57f2942 IButton now has Left/Right 
Added right-click skill removal.
 2014-04-06 12:45:52 +10:00
Chiss
8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Chiss
26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss
2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams
aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover. 
Fixed CustomBuild stuff.
 2014-03-27 22:17:31 -04:00
Jonathan Williams
17e6658437 Fixed up AntiHack database reporting. 2014-03-24 01:16:02 -07:00
Jonathan Williams
f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Jonathan Williams
246f28a464 Enabled DoubleGem weekend. 
Added 3 new maps
updated news
 2014-03-14 02:19:52 -07:00
Jonathan Williams
efee9fdcbf Fixed Hub class shop. 
Added chat logging.
Added message with file updater.
 2014-03-13 17:56:05 -07:00
Jonathan Williams
f51a6747fd Moved files into Mineplex.core 
Removed references to Core project.
 2014-03-09 00:50:13 -08:00
Jonathan Williams
d05c2f906c Fix for ServerNpc page beta join. 
Work on Dom 2.0

Added sheep quest map.
 2014-03-06 02:15:16 -08:00
Jonathan Williams
f0b347f97f Changed beta testing to Ultra and up. 
Did some work on DOM 2.0
 2014-03-05 00:34:20 -08:00
Jonathan Williams
d99a3c9253 Optimized mysql queries with server status' address/updated fields. 
Removed double gems.
Added BETA check for Hero only beta games.
 2014-03-03 12:47:57 -08:00
Chiss
8d0115f874 News update 2014-03-01 10:40:55 +11:00
Jonathan Williams
c2044f7e8a Added horse disguise. 
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.

Removed unnecessary region folder create in dominate.
 2014-02-28 01:18:32 -08:00
Jonathan Williams
f2570caad5 Swapped default connections to new dns names. 
Fixed bug with LobbyBalancer and retrieving no lobbies.
 2014-02-21 13:32:14 -08:00
Jonathan Williams
dea96a9e65 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-18 09:08:12 -06:00
Jonathan Williams
177f4a878b Removed bad eventhandler line 
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
 2014-01-18 09:02:56 -06:00
Chiss
75669e2333 Hub News Changes 
AntiHack Autokick for Severe Hackers
 2014-01-18 20:33:38 +11:00
Chiss
1031846198 SSM Update 
Gravity game start
 2014-01-18 12:34:24 +11:00
Jonathan Williams
8e51e4061a Reverted Hub. 
Fixed server monitor issues.
 2014-01-14 02:04:06 -06:00
Jonathan Williams
93c0575fe2 Fixed naming in some hub modules. 
Fixed StatusManager ip and DynamicServer comparison.

Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
 2014-01-03 01:37:39 -05:00
Chiss
f510083e7e formatting 2013-12-24 19:26:30 +11:00
Chiss
d25487d545 Rank color 2013-12-24 19:21:21 +11:00
Chiss
d92515eef9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-24 19:14:54 +11:00
Chiss
74e49a3ff1 Hero Rank stuff 
New SSM Kit
 2013-12-24 19:14:40 +11:00
Jonathan Williams
592d49e57c Added ghost check flag to ender dragon. 
Re-enabled Dragon Gadget.
 2013-12-24 03:09:15 -05:00
Jonathan Williams
6595d33899 Tuned chunk load for disguise manager. 
Disabled dynamic text in hub.
 2013-12-24 00:39:33 -05:00
Jonathan Williams
79de7f2bfc Fixed portal breaking with Frost horse. 
Added memory clean up for disguises
 2013-12-23 04:16:53 -05:00
Jonathan Williams
a02ca4513e Added undead/batgun and frost to in game shop for gems. 2013-12-21 07:29:04 -05:00
Chiss
e94784a908 dragon mount removed 2013-12-21 23:09:49 +11:00
Chiss
c08b7c7b96 hub news update 2013-12-21 22:21:16 +11:00
Chiss
bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss
0585116e78 Hub Gadgets 
Hub Dragon (Hero Only)
XMAS block efficiency
 2013-12-21 20:05:42 +11:00
Chiss
c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Chiss
c52a7d2fe1 Christmas update 
Hub Update
 2013-12-21 15:06:01 +11:00
Chiss
bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00
Jonathan Williams
44145e01f0 Removed weather for hub update. 2013-12-18 13:52:44 -05:00
Jonathan Williams
a24e8e233c Enabled pvp in hub for snowballs. 2013-12-18 05:56:59 -05:00
Jonathan Williams
e55885c85d itsy 2013-12-18 05:22:40 -05:00
Chiss
54f2cb3467 Christmas hub snowman target cancel 2013-12-18 19:58:39 +11:00
Chiss
de99a642d3 Hub tourney text removal 2013-12-17 11:06:04 +11:00
Chiss
4bef100c6a Xmas Hub 2013-12-16 14:32:51 +11:00
Chiss
c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss
9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams
6b92b6c4a8 Added stats manager. 
Added lots of missing files.
 2013-12-13 21:00:56 -08:00
Jonathan Williams
d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00
Jonathan Williams
03627eb0c3 Changed all mysql connections to be persistent. 2013-12-06 01:57:09 -08:00