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

409 Commits

Author SHA1 Message Date
Shaun Bennett
a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -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
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