2e06a272b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-09 16:43:00 -04:00
e443b41e15
removed unfinished code
2015-03-09 22:16:08 +11:00
16a8fbe088
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-09 22:15:38 +11:00
3a0e597276
more event server stuff
2015-03-09 22:15:24 +11:00
6614f83579
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-08 20:01:58 -07:00
7dbf970df7
Add support for multiple slave connections for load balancing.
2015-03-08 19:17:28 -04:00
fbe6b294cb
Removed redis logging.
2015-03-08 13:51:31 -07:00
72ca1005b3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-08 13:48:52 -07:00
27c17eccfb
Disabled redis pub commands.
...
Added getServerStatusesByPrefix to redis.
Increased timeout for servers.
Turned on DoubleGemWeekend
2015-03-08 13:47:49 -07:00
2b74e774f1
Redirect ServerCommand PubSub connections to standalone redis instance to distribute load.
2015-03-08 16:46:35 -04:00
dbeea5bf69
Pre-Frost changes
2015-03-09 05:17:04 +13:00
8cc60e1b65
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-07 21:49:37 -08:00
579ac8171d
Hard-coded UUIDs for Staff Server to prevent UUID lookup Rate limits
2015-03-07 21:48:51 -08:00
bd8c101901
Slowed down interval for pulling servers on bungees.
2015-03-07 21:48:15 -08:00
14da350b16
Removed unnecessary Windows DB call for Pet Factory.
2015-03-07 21:47:48 -08:00
521891f409
Updated BungeeRotator to reflect new API key and abide by new rate limits.
2015-03-07 21:47:02 -08:00
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
ac4b495301
Created internationalization helper class and began i18n process
2015-03-07 20:50:47 -05:00
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
adfe5fb74e
Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.
2015-03-07 19:36:54 -05:00
e0ba667613
old chests drop a little more frequently
2015-03-07 11:53:18 +11:00
480a5225f3
increased coin loot from rare chest drops
2015-03-07 11:49:01 +11:00
f2a71b2ea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-07 11:13:30 +11:00
683f86bd89
event server fixes and parser gamtypes
2015-03-07 11:13:17 +11:00
90dbd64b17
Added closes to connections in RepositoryBase that use DataSource.
2015-03-06 04:12:46 -08:00
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
2d7f65588c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-06 01:36:38 -08:00
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
0336df55aa
Event update
2015-03-06 19:43:17 +11:00
e62d9774a9
Initial Event Game push
2015-03-06 19:11:26 +11:00
5c738a2e3c
Added two-strike system to NCP hooks.
2015-03-05 16:46:50 -08:00
8ddce7cb32
Reduced process wait time per server kill/create
...
Added kill bypass for first startup (network reset)
Fixed some log messages that weren't being logged.
2015-03-02 13:42:34 -08:00
3e27675d96
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-02 12:50:28 -08:00
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
c09a23f2bc
Save MapParser's new world spawn location to 0,0 on creation
2015-03-02 03:45:26 +13:00
d6c3b330b5
Fix redis working on the same thread
2015-03-02 03:44:38 +13:00
789e750cbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-01 01:09:28 -08:00
5816da496d
Adopted StaffServer project to refactors.
...
Added default rank package for staff server.
2015-03-01 01:09:22 -08:00
1fbadfa4f4
Don't compare player world to a plugin fetched world, instead compare the name.
2015-03-01 18:18:53 +13:00
26e6b66cf5
Fix staff server capitalization changes
2015-03-01 17:41:17 +13:00
3f7eceb907
Disable redis being sent for player messaging and parties.
2015-03-01 17:40:52 +13:00
3b4075392a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-03-01 15:16:15 +13:00
e5189bea40
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-28 10:26:25 -08:00
81a7e1f1f2
Better hover effect for treasure chests - also fixes hover only showing for old chests
2015-02-28 00:37:22 -05:00
42600a0c70
Call direct methods in friends gui instead of running commands (prevents getting command spam errors when trying to mass add/delete friends)
2015-02-27 23:36:36 -05:00
c916957a07
Fix block morph with treasure chests
2015-02-27 23:22:45 -05:00
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
d23d146f35
Fix up admin message typos
2015-02-27 21:12:31 +13:00
9802c00ec5
Add /spawn and /setspawn commands to MapParser
2015-02-26 21:40:09 +13:00
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
d9184ad423
Disable /a for muted players
2015-02-25 23:20:40 +13:00
145bf98590
Add JIRA configuration for IntellIJ IDEA
2015-02-24 21:18:08 -05:00
cf7e2eed69
Merge with MPS Update
2015-02-24 21:11:16 -05:00
85ee98782e
Revert "Move clans database calls to a seperate thread"
...
This reverts commit 61b1e3f48b
2015-02-24 21:04:57 -05:00
ad5481ef9c
Revert "Remove arcade repository stuff"
...
This reverts commit a5f7050e40
2015-02-24 21:04:19 -05:00
45fd3cc537
Revert "Update JOOQ files, update IntelliJ config file for JIRA"
...
This reverts commit db3f2989c0
2015-02-24 21:03:59 -05:00
bfb0c157a2
Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths
2015-02-25 13:56:32 +13:00
cea172a713
Give more cpu to SnrMod+/Youtube private servers
2015-02-24 17:39:02 -05:00
be591c7d09
Disallow start/stop/kick/setgame while a game is in progress for Donor ranks
2015-02-24 17:22:47 -05:00
857052992d
Increase max player cap to 100 for SnrMod+/Youtube
2015-02-24 14:47:10 -05:00
570374fbb4
Add Wither Assault and Wizards gametypes to legend+ private servers
2015-02-24 14:45:31 -05:00
47ef3617f4
Give SnrMod+/Youtube servers 2GB of ram instead of 1GB
2015-02-24 14:43:38 -05:00
48dd5639d2
Kick banned players from games
2015-02-24 14:38:12 -05:00
0bf6866ad7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-23 20:56:34 -05:00
fc5771b33c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-24 13:04:06 +13:00
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
e1818a9c32
Fixed stat overrite bug.
2015-02-23 00:45:45 -08:00
0a2e11e8bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-20 23:56:24 -08:00
87558eb01a
Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
...
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
Remove old lines of debug code.
Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
53bb67ec4f
Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits
2015-02-21 20:41:07 +13:00
c02adc0232
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-20 23:29:44 -08:00
e6eb938b96
Delayed whitelist additions.
2015-02-20 23:29:19 -08:00
e1f7e2dbcc
Remove old lines of debug code.
2015-02-19 18:55:21 -05:00
def101cc8d
Add in hooks to update statistical events log for leaderboards.
...
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
6a368454ec
Clans database refactoring
2015-02-18 21:31:38 -05:00
aebe390c3c
Refactored ClanRole enum
2015-02-18 19:56:29 -05:00
44f453c56e
Updated jOOQ and database tables
2015-02-18 18:51:36 -05:00
0aee8042b5
Changed /locate to return the located players name, not fed target
2015-02-18 09:27:58 +13:00
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
3b0a131ca2
If private messaging is turned off, deny messages, even from friends.
2015-02-15 22:10:15 +13:00
3ef3689e6d
Fixed RedisMessageCallback not being registered
2015-02-15 22:01:10 +13:00
fd0547d9d3
Added connection re-establishment to database calls if error occurs.
2015-02-14 22:50:52 -08:00
c129deb201
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-14 22:05:24 -08:00
cdbf6c450e
fixed mis-named gameloot chests
2015-02-15 17:35:58 +13:00
17543910b5
Added Chest packages to support server.
...
Fixed Punish not loading.
2015-02-14 15:09:42 -08:00
c50e79355f
Added proper logging to BungeeRotator
2015-02-14 13:49:09 -08:00
e33fd3f249
disallow people from talking about hacks in chat.
2015-02-15 09:01:55 +13:00
0071d6220d
Change locate command to moderators and up
2015-02-14 22:22:15 +13:00
6ff0928fbd
Fixed RB with exemption in NCP hooks.
2015-02-14 00:48:07 -08:00
beac0b4828
Added try catch in BungeeRotator and ServerMonitor so they don't crash out.
2015-02-14 00:47:03 -08:00
61b1e3f48b
Move clans database calls to a seperate thread
2015-02-13 07:34:09 -05:00
a5f7050e40
Remove arcade repository stuff
2015-02-13 07:33:50 -05:00
0cd0c61200
Add /locate|where|find command to find other players in other servers
2015-02-13 20:57:46 +13:00
db3f2989c0
Update JOOQ files, update IntelliJ config file for JIRA
2015-02-12 14:17:04 -05:00
876005b3e3
Fixed sending admin cross-server messages not setting last admin to
2015-02-12 22:27:09 +13:00
858a6fb674
Fixed FriendsGUI not removing ghost items when redrawing page
2015-02-12 04:08:43 +13:00
9bdf248643
Add cross-server message and adminmessage commands. Fixed casing on messagecommands package.
2015-02-12 04:08:06 +13:00
1b11c5dbbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-12 04:06:19 +13:00
f41473da8f
Add message to unignore when no parameters are given
2015-02-11 23:11:21 +13:00
6383cf7ce6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-02-10 18:17:13 -08:00
1b4d1d94e9
Merge remote-tracking branch 'origin/master'
2015-02-10 21:15:53 -05:00
58eaaaa2ee
Treasure fixes
2015-02-10 21:15:44 -05:00
86b0a578ba
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 18:13:49 -08:00
264ecfc362
lowered legendary chance on old chest slightly
2015-02-11 15:13:33 +13:00
f0d2ff1c9d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 17:44:36 -08:00
500e37a618
fixed ender chest shop item
2015-02-11 14:44:14 +13:00
92d3a7dab8
all chests purchasable by coins
2015-02-11 14:42:41 +13:00
e03c65769d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-11 14:16:58 +13:00
cafa59d7e8
adjusted reward rarities
2015-02-11 14:16:08 +13:00
594f0c6045
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 17:15:06 -08:00
e21e27f07f
Merge remote-tracking branch 'origin/master'
2015-02-10 13:33:59 -05:00
6b3f2114f2
Holy debug code!
2015-02-10 13:27:29 -05:00
80a5acd9f2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 04:18:05 -08:00
5a516e4c78
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-11 00:59:45 +13:00
77350e51de
Using the wrong servername in PlayerTracker
2015-02-11 00:58:21 +13:00
258c1ca7fc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 02:27:05 -08:00
d9521bd05a
lowered gameloot chances
2015-02-10 23:26:37 +13:00
ff10d0cb06
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 02:22:57 -08:00
246acc721a
Clans compiles now ;)
2015-02-10 02:22:47 -08:00
4c0e6642f4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 02:12:23 -08:00
3a912c13ec
Add nocheat to MPS
2015-02-10 02:11:27 -08:00
01173a2e13
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 19:12:56 +13:00
884df48695
disguise command (not yet working fully)
2015-02-10 19:08:54 +13:00
336ba50f59
Rename some enum values for treasures, update my packet change
2015-02-09 23:24:43 -05:00
cb9246281c
TEASURE! +R
2015-02-10 16:49:50 +13:00
37a5024fcd
more chest polish
2015-02-10 13:22:42 +13:00
04d0a1cba1
fixed lore
2015-02-10 12:40:51 +13:00
edddff503e
Treasure ready ;o
2015-02-10 12:38:08 +13:00
c1f9f94c2a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 12:23:28 +13:00
6bbf9bd321
Ability to purchase old chests
2015-02-10 12:23:11 +13:00
af95d3ba4e
Treasure update
2015-02-10 12:09:37 +13:00
c2c63f4fc0
Null check in MessageManager
2015-02-10 04:17:38 +13:00
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
cf0134a577
Change commandmanager to cancel event if command is registered, despite not having permissions
2015-02-10 02:20:54 +13:00
51e1798d8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-09 00:19:15 -08:00
c5b7e97623
Added NoCheatPlus hooks.
2015-02-09 00:18:51 -08:00
fb563c9274
Fixed customer support whitelist names.
2015-02-09 00:16:20 -08:00
fcba1db291
Fixed server transfer bug.
2015-02-09 00:15:45 -08:00
f98d6e0534
Fixed personal servers overriding existing servergroups.
2015-02-09 00:15:18 -08:00
26463ba75d
Treasure changes :O
2015-02-09 20:24:20 +13:00
c285fae035
Merge remote-tracking branch 'origin/master'
2015-02-06 23:40:14 -05:00
b85494a037
Show player skins in friend gui
2015-02-06 23:40:06 -05:00
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
219ac93dc4
Don't allow the server to increment the mapcount information.
2015-02-07 16:06:53 +13:00
c61f97d0eb
Why didn't this get included in that previous commit..
2015-02-07 03:54:19 +13:00
8851cccff4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-07 03:53:17 +13:00
68d1ba4507
Add API to create walls of maps to create a giant image. Please use responsibly.
2015-02-07 03:52:19 +13:00
de1d2d4688
Just ignore this commit. Nothing fancy here!
2015-02-06 00:42:17 -05:00
36b43af2c2
Fix inconsistency in friends gui
2015-02-06 00:14:46 -05:00
48db23c862
Fix for enderchests closing after being opened, go shaun!
2015-02-06 00:10:17 -05:00
922f2d5ee9
Merge remote-tracking branch 'origin/master'
2015-02-05 23:20:45 -05:00
fcb3d20778
Move tablist stuff to portal, show current server on tablist
2015-02-05 23:20:39 -05:00
2f64b5f401
1.8 tablist fix - spigot needs to be updated!
2015-02-05 23:09:20 -05:00
417122b7a7
reduced rate that smash crystal spawns
2015-02-06 14:47:34 +11:00
09b78fccd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-06 14:16:26 +11:00
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
f8885e4c5c
Merge remote-tracking branch 'origin/master'
2015-02-05 21:36:19 -05:00
d878e3940e
War state, handle time better, ability to have a server timezone (see ClanManager)
2015-02-05 21:36:07 -05:00
25548046d8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-05 23:42:41 +13:00
f549402712
Modify wizards to use | for bossbar displays
2015-02-05 23:42:26 +13:00
79cde8f5cf
fixed util textbottom for 1.8.2
2015-02-05 21:39:42 +11:00
64b79424d7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-05 22:34:34 +13:00
6f8d39b630
Fixed spiders climbing liquids
2015-02-05 22:34:06 +13:00
44bab01e33
Added NoCheatPlus hook for double jump fly hack prevention.
2015-02-04 21:52:14 -08:00
fabf385a57
Added exception handling for group change exceptions so entire dynamic monitor doesn't stop.
2015-02-04 21:41:33 -08:00
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
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
ea30645d42
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-04 18:37:32 +13:00
55b9435877
Change event used to track player's in bungee
2015-02-04 18:36:44 +13:00
0f23533f41
Fix typos in EnemyData
2015-02-03 23:18:42 -05:00
2060b74343
War death handling, more war logic, other fixes
2015-02-03 19:35:53 -05:00
b0be5b2510
Time code for war, server time command
2015-02-03 16:48:26 -05:00
3b324448b5
Fix errors in war manager
2015-02-03 14:19:22 -05:00
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00
bb197ff629
Merge War and Energy
2015-02-03 14:14:52 -05:00
b0a2e655c1
Changes to IntellIJ Files
2015-02-03 14:12:52 -05:00
6cefeb1b74
More work on War
2015-02-03 14:02:45 -05:00
87f038d21d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-03 22:03:26 +13:00
e91d76960c
Add a toggleable friends GUI - Chat to Inventory and back
2015-02-03 22:03:07 +13:00
f1930ed7c1
Only record bungee stats for your region...servermonitor
2015-02-01 00:56:18 -08:00
9118aef60f
Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.
2015-02-01 16:03:29 +13:00
01fa5b5882
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-01 12:19:51 +13:00
ea24bc1d87
Prevent treasure chests being opened from interfering with portals, ladders, etc.
2015-02-01 12:19:33 +13:00
56fd245032
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-31 14:19:45 -08:00
9d3f5f9bc8
Fixed reconnect for bungee connection in StatusHistoryRepository
...
Added error catching to ServerMonitor so it doesn't stall program.
2015-01-31 14:19:33 -08:00
f9cbab6fd8
SuperSmash no longer restores hunger unless you damage a player, not a entity
2015-02-01 09:47:00 +13:00
4f9f0afa29
BlockToss can no longer pickup blocks next to ladders
2015-02-01 09:40:36 +13:00
6f369cbcdb
Sort players in spectator menu by name
2015-02-01 08:25:38 +13:00
eccc2f2fb0
Fixed bug with dropping gadget items interfering with games and being set in the wrong slot with the wrong name
2015-02-01 08:04:19 +13:00
0c2054ac32
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 20:49:51 +11:00
f03c9d5bab
Fixed damage rate on barrage
2015-01-30 20:48:46 +11:00
ff56578d15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:29:12 -08:00
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
ff73c88182
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 19:28:29 +13:00
a1529e0884
Notify player when no friends found when searching
2015-01-30 19:28:04 +13:00
352a29390b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:19:12 -08:00
ed08e4b112
Changed coloring for server line in friends gui.
2015-01-29 22:18:59 -08:00
115f9b58ab
Spider nest :)
2015-01-30 17:02:28 +11:00
9b5b1f635f
Merge remote-tracking branch 'origin/master'
2015-01-30 00:37:16 -05:00
Tim Ziankoski
Cheese
Jonathan Williams
Ty Sayers
libraryaddict
Shaun Bennett
Mini-Chiss