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

2690 Commits

Author SHA1 Message Date
Cheese 98960b6ce7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 15:40:41 +11:00
Ty Sayers f812243185 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-03-12 18:20:08 -04:00
Ty Sayers 33ff7f8e50 Convert leaderboard stat events to insert into the repository using asynchronous task calls. 2015-03-12 18:19:58 -04:00
Jonathan Williams 6394b588ab Re-enabled cross-server functionality. 
RedisPartyHandler execution is now run on Bukkit main thread.
 2015-03-12 04:10:15 -07:00
Jonathan Williams ca9ebbb1bd Updated NoCheatPlus.jar - Removed VehicleExit check because we don't use and we altered the event. 
It spammed consoles when people dismounted from non-vehicles.
 2015-03-12 04:09:38 -07:00
Jonathan Williams 98b14c9c7e Fixed Clans repository so it uses the pool. 2015-03-11 19:20:42 -07:00
Shaun Bennett 7fd08c6b7b Merge remote-tracking branch 'origin/master' 2015-03-11 22:18:50 -04:00
Shaun Bennett f660620e4b Revert "Pre-Frost changes" 
This reverts commit dbeea5bf69.
 2015-03-11 22:18:29 -04:00
Ty Sayers 468f354422 Add fifth slave instance to port 6382. 2015-03-11 22:08:32 -04:00
Ty Sayers b7a4dd775c Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-03-11 21:52:57 -04:00
Ty Sayers 9788436700 Convert cross-server commands to utilize master-slave redis instances rather than a stand-alone instance. 
Add new slave instance on port 6377.
 2015-03-11 21:42:52 -04:00
Jonathan Williams 23de2f735d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-11 18:31:29 -07:00
Jonathan Williams bf87cfd0cd Merge remote-tracking branch 'remotes/origin/sql_pooling' 2015-03-11 18:30:52 -07:00
Cheese bf901b2280 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-12 12:15:48 +11:00
Cheese 8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11: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
Jonathan Williams a955526adf Disabled double gems. 2015-03-11 17:24:03 -07:00
Jonathan Williams 1ab43c9f44 Added new support agent to whitelist for customer support server. 2015-03-11 17:23:48 -07:00
Jonathan Williams 4db745c1e5 Added Version and IP logging for Bungees. 2015-03-11 17:23:23 -07:00
libraryaddict 9cf0e4d1e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-11 13:17:16 +13:00
libraryaddict f47447134e Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands 2015-03-11 13:16:00 +13:00
Tim Ziankoski 759db08679 Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex" 
This reverts commit 2e06a272b4, reversing
changes made to e443b41e15.
 2015-03-09 17:24:01 -04:00
Tim Ziankoski 2e06a272b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 16:43:00 -04:00
Cheese e443b41e15 removed unfinished code 2015-03-09 22:16:08 +11:00
Cheese 16a8fbe088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 22:15:38 +11:00
Cheese 3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
Jonathan Williams 6614f83579 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-08 20:01:58 -07:00
Ty Sayers 7dbf970df7 Add support for multiple slave connections for load balancing. 2015-03-08 19:17:28 -04:00
Jonathan Williams fbe6b294cb Removed redis logging. 2015-03-08 13:51:31 -07:00
Jonathan Williams 72ca1005b3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-08 13:48:52 -07:00
Jonathan Williams 27c17eccfb Disabled redis pub commands. 
Added getServerStatusesByPrefix to redis.
Increased timeout for servers.

Turned on DoubleGemWeekend
 2015-03-08 13:47:49 -07:00
Ty Sayers 2b74e774f1 Redirect ServerCommand PubSub connections to standalone redis instance to distribute load. 2015-03-08 16:46:35 -04:00
libraryaddict dbeea5bf69 Pre-Frost changes 2015-03-09 05:17:04 +13:00
Jonathan Williams 8cc60e1b65 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 21:49:37 -08:00
Jonathan Williams 579ac8171d Hard-coded UUIDs for Staff Server to prevent UUID lookup Rate limits 2015-03-07 21:48:51 -08:00
Jonathan Williams bd8c101901 Slowed down interval for pulling servers on bungees. 2015-03-07 21:48:15 -08:00
Jonathan Williams 14da350b16 Removed unnecessary Windows DB call for Pet Factory. 2015-03-07 21:47:48 -08:00
Jonathan Williams 521891f409 Updated BungeeRotator to reflect new API key and abide by new rate limits. 2015-03-07 21:47:02 -08:00
Ty Sayers 60e41c08b4 Merge pull request #13 in MIN/mineplex from redis_replication to master 
* commit '4237cd082c9871432d4beee325b102068e632f13':
  Add support for master-slave replication in redis to balance load of read and writes. Redis based repositories now read/write to specified connection pools (master or slave).
 2015-03-07 22:51:28 -06:00
Ty Sayers 4237cd082c Add support for master-slave replication in redis to balance load of read and writes. Redis based repositories now read/write to specified connection pools (master or slave). 2015-03-07 23:19:35 -05:00
Tim Ziankoski ac4b495301 Created internationalization helper class and began i18n process 2015-03-07 20:50:47 -05: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
Cheese e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese 480a5225f3 increased coin loot from rare chest drops 2015-03-07 11:49:01 +11:00
Cheese f2a71b2ea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 11:13:30 +11:00
Cheese 683f86bd89 event server fixes and parser gamtypes 2015-03-07 11:13:17 +11:00
Jonathan Williams 90dbd64b17 Added closes to connections in RepositoryBase that use DataSource. 2015-03-06 04:12:46 -08:00
Jonathan Williams c15c6e2dd8 Removed threading for ServerCommandManager 
Removed target server check (some commands are broadcasted)

Disabled Message/Party crossserver listeners.
 2015-03-06 04:12:11 -08:00