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

97 Commits

Author SHA1 Message Date
LCastr0
d75abe3aea Persistence fixes 2016-06-25 00:36:00 -03:00
LCastr0
83f4b25887 Testing persistence fixes 2016-06-25 00:33:36 -03:00
Shaun Bennett
fd843b88cb Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
 2016-06-23 23:02:26 -07:00
Shaun Bennett
a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
LCastr0
7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
LCastr0
a441727e09 Freedom update: 
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
 2016-06-23 16:09:31 -03:00
Shaun Bennett
e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
LCastr0
ed68ef332b Fixes for Win Room (Players were able to see other players) 
Added command to allow other players to run ranked commands
Fixes code styles
 2016-05-22 21:05:48 -03:00
LCastr0
0109e2f2dd Fixes for Illuminated chest 
Fixes for /check command (Support)
 2016-05-20 23:33:58 -03:00
Ben
35c7b9a2bd Incognito Updates: 
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
 2016-05-17 18:10:07 -05:00
AlexTheCoder
b4c5be81f3 - Fixed random weather in MCL 
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
 2016-04-27 23:12:38 -04:00
Ben
a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
Ben
876a7a8eb6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-05 12:37:23 +01:00
Ben
7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Jonathan Williams
8ea0051181 Fixed customer support menu not showing if monthly bonus hasn't been claimed. 2016-04-04 17:46:03 -05:00
Jonathan Williams
400d2f0cca Added bonus log view for customer support. 2016-04-04 00:59:13 -05:00
Shaun Bennett
7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
Shaun Bennett
684a40db41 Fix giving TITAN in Staff Server 2016-02-16 16:55:00 -06:00
Shaun Bennett
eca400278c Support server update 2016-02-12 05:00:09 -06:00
Shaun Bennett
dfd61833b7 Valentines changes 2016-02-12 03:03:47 -06:00
Mysticate
0f5be6444b Yo shaun debug this m8 ty 2015-12-21 02:23:59 -05:00
Jonathan Williams
2953fe395f Changed dns api key to new key. 
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
 2015-12-17 18:33:49 -05:00
Jonathan Williams
222173ab17 Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
Jonathan Williams
b6f6d4458e Fixed StaffServer. 2015-11-28 01:43:00 -06:00
Jonathan Williams
6e90052480 Updated StaffServer to 1.8 2015-11-10 02:01:39 -06:00
Jonathan Williams
3a0b8d75a2 Added new support member. 2015-11-01 22:09:50 -06:00
Jonathan Williams
5c2ade8270 Updated staff list. 2015-10-31 14:55:34 -05:00
Jonathan Williams
512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Jonathan Williams
9f1c4653f4 Fix for Customer support item command with the removal of item categories. 2015-10-04 11:48:16 -05:00
Jonathan Williams
e9b33668bc Added donorsOnline to MinecraftServer snapshot 
Refactored Rank class to use lowercase methods.
 2015-08-28 13:22:04 -07:00
Jonathan Williams
26ed7ebb94 Fixes to redis 
Fixes for stat handler.
 2015-07-26 08:49:35 -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
Jonathan Williams
7684e1837d Added new support staff to whitelist. 2015-07-10 15:31:38 -05:00
Jonathan Williams
77a63f72cc Updated staff server white list. 2015-07-09 11:07:16 -05: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
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
Jonathan Williams
91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Jeremiah Bishop
dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Jonathan Williams
476dd17ffe Fix for null rank in /c staff server. 2015-05-17 23:11:04 -07:00
Jonathan Williams
d8ed866ada Fix for duplicate names in db. 
Adjusted staff server whitelist and op list.
 2015-04-21 23:35:41 -05:00
Jonathan Williams
d25b39058a Fixed bunny morph name. 2015-04-03 04:19:48 -07:00
Jonathan Williams
0119e99adf Added EasterBunny package for support server. 2015-04-03 03:07:49 -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
294041b821 Removed Missing Coin application functionality from CustomerSupport server. 2015-03-25 15:05:06 -07:00
Jonathan Williams
3e17638bf0 Customer support re-add Dooskee. 2015-03-17 16:22:18 -07:00
Jonathan Williams
838df3f57a Added UUID lookup for saveRank call. 2015-03-13 17:52:25 -07:00
Jonathan Williams
e776a9f886 Added new customer support agents to StaffServer 2015-03-12 15:32:35 -07: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