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
96ce95b72e
treasure changes
2015-01-30 00:37:02 -05:00
5b112caa4a
Bone Storm buff
2015-01-30 16:10:03 +11:00
c066cb5185
Fixed Bugs
2015-01-30 16:08:22 +11:00
3fdf914d63
Smash Wolf Update!
2015-01-30 15:18:50 +11:00
76b76cd38c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 14:42:51 +11:00
c8afa151d9
SSM Zombie + Spider Update
2015-01-30 14:42:39 +11:00
79a60db15d
More tweaks
2015-01-29 22:41:54 -05:00
1cc0879ce9
treasure stuff
2015-01-29 22:17:46 -05:00
81a52184c9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 17:50:24 -08:00
b14d09ed2c
Reduced connection checking to every 2 minutes.
...
Removed kill script call as it was encountering access errors..
2015-01-29 17:47:59 -08:00
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
908533b232
Added some exception protection in Redis retrieve dedicated servers.
...
Removed Statifier project.
Improved ServerMonitor:
- Added recording of dedicated server stats
- Added recording of server group stats
- Added recording of bungee stats
- Added recording of network stats
2015-01-29 07:05:50 -08:00
ebc74e5565
Fireball still too fast
2015-01-29 15:01:00 +13:00
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
2dfdde4457
Kit mage will now start with two spells
2015-01-28 03:01:44 +13:00
1da873ab8f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-27 21:09:31 +13:00
94f79990e4
Kit changes to wizards
2015-01-27 21:09:15 +13:00
290e4d69df
map parser update
2015-01-27 13:59:28 +11:00
19208de075
mroe map parser ^_^
2015-01-26 11:53:48 +11:00
90573903da
added new gametypes for parser
2015-01-26 11:33:47 +11:00
b98950b121
map parser visual changes
2015-01-26 11:31:42 +11:00
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
76e6b7530f
Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts
2015-01-26 09:09:46 +13:00
b4b8b307b0
Rename Wizard Battles to Wizards
2015-01-25 18:50:45 +13:00
c19f10aff9
Reduce kit mystic mana regen to 10%
2015-01-25 18:33:22 +13:00
8262eb9f48
Rebalance explosive rune, fix rank bug and books no longer drop
2015-01-25 18:27:21 +13:00
7682907478
Wizards modifications - Its amazing how things slip past you
2015-01-25 06:18:07 +13:00
38aac5bab0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-24 23:14:54 +13:00
3525243f9d
Numerous fixes to Wizards
2015-01-24 23:14:23 +13:00
58a8a32e93
Added cross-server Announcements and Global messages.
2015-01-24 01:44:22 -08:00
d6e8fdd2ed
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 23:33:39 -08:00
39d1a48bc1
Added cross-server instant punishments.
...
[Punish] Banning doesn't kick.
2015-01-23 23:33:24 -08:00
3ff0592d2d
Mild fix on fireball, fix heal given less cooldown and lower heal spell heals
2015-01-24 13:51:18 +13:00
31c1be9dd8
Nerf the spell heal
2015-01-23 23:25:03 +13:00
99c9bfbf33
Left clicking a chest is harmless
2015-01-23 23:18:29 +13:00
da81d131a7
Don't open wizard spell menu if they right clicked a chest
2015-01-23 23:17:45 +13:00
b00deb683e
Red overtime
2015-01-23 22:28:07 +13:00
5b39f1642d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 01:17:38 -08:00
34cd48cfb6
Fix for duplicate check.
2015-01-23 01:17:27 -08:00
def2018c8b
Remove center blocks of stone wall wizard spell
2015-01-23 22:15:27 +13:00
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
b92226a771
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 00:55:36 -08:00
c5b444ae6e
Wizards push
2015-01-23 21:52:03 +13:00
73866669b8
Added RestartCommand and SuicideCommand
...
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.
Fixed issue with new servers getting cleaned up as excess as soon as they started.
2015-01-22 23:19:40 -08:00
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
8bf64ec55c
Database and code implementation of enemies
2015-01-22 22:17:19 -05:00
882eb46479
Unclaiming land when you run out of energy
2015-01-22 21:32:10 -05:00
2bab4133b0
Fix ugly /gold command
2015-01-22 20:41:05 -05:00
a1f2a3a2a1
Clan Energy
2015-01-22 20:34:44 -05:00
0b8babb36d
Spectator menu shouldn't be opened when standing on pressure plates should it..
2015-01-23 02:31:38 +13:00
fa47f33407
*cough* fixes to UtilTime *cough*
2015-01-23 02:31:00 +13:00
74d7c7df2b
More wizard modifications
2015-01-23 02:30:44 +13:00
29dc598c00
Update the fireball times to 20min
2015-01-22 01:00:57 +13:00
94607585a3
Fixed UtilTime being bugged
2015-01-21 19:00:39 +13:00
eb7e68885b
Hunger now takes longer to decrease
2015-01-21 19:00:26 +13:00
dd2418232c
Wizards progress
2015-01-21 19:00:07 +13:00
d5ddb9c640
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-19 00:50:13 -08:00
d90a46252e
Allow commands to pass when muted.
2015-01-19 00:50:05 -08:00
52d83587cd
Fix dragon bossbar not being halved
2015-01-18 21:23:50 +13:00
e11e2090ad
Fix up spells somewhat
2015-01-18 21:23:50 +13:00
9b574de541
Current wizards
2015-01-18 21:23:49 +13:00
1ea19ee2e7
Add spell HealingRune, deny weapon crafting, use scoreboard for a simply display
2015-01-18 21:23:49 +13:00
ea452d8fa5
Wizards progress
2015-01-18 21:23:48 +13:00
72e61a02df
Changes to wizards
2015-01-18 21:23:48 +13:00
9b4f1a491e
Add new method to Hologram - Remove hologram on entity death
2015-01-18 21:23:47 +13:00
611d184024
Cleanup code, add custom explosion, add lance and traprune spell
2015-01-18 21:23:47 +13:00
a42cfed226
Add a comment on what each of the block hashsets do in UtilBlock to make it easier to use without struggling to remember
2015-01-18 21:23:46 +13:00
0ad4034f96
The beginnings of a api to calculate shapes; mainly for particle use
2015-01-18 21:23:46 +13:00
d6b5439eb5
Initilize the static byte HashSet's in UtilBlock not when you try to compare a block, but on class load
2015-01-18 21:23:45 +13:00
b40393af10
Modify UtilPlayer to get the entity someone is looking at
2015-01-18 21:23:45 +13:00
d6d01241cb
Progress on wizards
2015-01-18 21:23:44 +13:00
d232bab051
Wizards Game Progress. Now workable
2015-01-18 21:23:43 +13:00
0648276720
Current progress on wizards
2015-01-18 21:23:03 +13:00
34ce818614
Stupid else ifs
2015-01-18 21:23:03 +13:00
a64e082f2c
Only add a 's' to UtilTime's convertString if the number in the string is not a 1
2015-01-18 21:23:03 +13:00
5a5946c0d0
Current progress on wizards - Working on scoreboards in a new branch
2015-01-18 21:23:02 +13:00
a3e0a6b4fd
Wizards Commit
2015-01-18 21:23:02 +13:00
c8be08e5b9
Merge remote-tracking branch 'origin/master'
2015-01-16 15:30:16 -05:00
b395508f0e
54b7f21604c94e9ad2f53956 Flag for Poll DIsplay
2015-01-16 15:30:06 -05:00
78cd5e7070
Changed hub to normal.
2015-01-15 00:39:07 -08:00
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
b32259d7f1
Fixed length checking with team prefix in GameScoreboard
2015-01-12 12:58:40 -08:00
d9360f2599
Ok testing fail. Reverted ServerConfiguration change.
2015-01-12 12:48:57 -08:00
cd5574ab43
Changed ServerConfiguration to only pull its groupName specifically.
...
Changed StatsManager to only run once every second and to upload all stats.
2015-01-12 12:19:13 -08:00
9839edeeee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-12 09:55:44 -08:00
e14dfcf313
Fixed Lobby sending with Portal.
2015-01-12 09:55:32 -08:00
b2fde6c6ca
Do a for(15) loop instead of while true. Don't update scoreboard if its unchanging
2015-01-12 12:22:01 +13:00
1006d66e0a
Format Scoreboard, fix displaying more than 15 lines
2015-01-12 12:09:45 +13:00
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
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
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
0a99a9aa40
Debug flag now depends on file.
2015-01-10 13:19:33 -08:00
fa59ed52b9
Fixed arrow count not updating on shoot cancel
...
Spectators are now permitted to walk on enemy turf
2015-01-11 09:49:46 +13:00
0d27649e85
Fixed minor bug in ServerMonitor.
2015-01-10 11:53:51 -08:00
8de8d31eec
Added pool based repository and converted everything but account and donation repositories to it.
2015-01-10 11:53:25 -08:00
6343a00b53
Instead of removing the shot arrow, cancel the event instead. Fixes kit Shredder being usable during buildtime
2015-01-10 09:08:35 +13:00
9863b701d8
Fixed typos in descriptions of SSM kits Wolf and WitherSkele
2015-01-10 08:54:00 +13:00
7db748bbe1
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-08 13:08:57 +11:00
9daee9733f
Fixed UHC height limit
...
fixed UHC rejoin health bug
2015-01-08 13:08:15 +11:00
836547f4f6
Added a delay to killing 'dead' servers and a verification run after the initial test before killing.
2015-01-06 10:39:18 -06:00
fc45b80e2b
Added rank pulling on bungee login and the ability to put a cap on network player count.
...
Removed log message for converted server group.
2015-01-03 23:37:04 -06:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
a472404316
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-03 18:04:08 -06:00
7de1c05d1c
Clans run configuration, build configurations, and minor fixes on hub and arcade build configs. (IntelliJ IDEA)
2015-01-03 15:35:47 -05:00
86993ddd55
Fixes again for number player names.
2015-01-03 04:27:28 -06:00
cc06b0ad33
Refactored statmanager to only upload stats on disconnect and only one player per tick.
...
Fixed derp json crap with redis treating a name with only numbers as a number and adding .0 on it.
2015-01-03 01:58:04 -06:00
2a29def670
Bungee rotator only waits 5 minutes before determining a bungee is offline.
2015-01-03 01:53:38 -06:00
aca7fd6849
Removed all create calls
2014-12-31 09:38:41 -05:00
4b937dfade
Refactored inventory repository to use 1 second queue
...
Added 15 second timeout for server connection if db freezes.
2014-12-31 09:38:28 -05:00
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
f0e3520343
Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin
2014-12-29 08:02:14 -05:00
01bc2ed2ba
Uno mas warning cleanup.
2014-12-29 07:11:21 -05:00
8b5d6ecb6c
Cleanup of warnings.
2014-12-29 07:10:41 -05:00
419f33fcc3
Refactored AntiHack a bit to try and remove CCM
2014-12-29 07:07:05 -05:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
a7f77c09fe
Work towards another memory fix.
2014-12-29 06:42:43 -05:00
5a57c5f372
Added Gold saving/retrieval from mysql.
...
Converted DonationManager to MiniDbClientPlugin.
Fixed bug in DonationRepository with gold.
2014-12-29 06:42:20 -05:00
2480361421
LightningOrb now strikes all living entities instead of just players.
2014-12-27 03:25:54 -05:00
d83a63ef57
Changed FriendManager to start supporting expiry friend requests.
2014-12-26 07:36:07 -05:00
8702bafbd0
Changed storage to player names instead of Player object for CustomTagFix
2014-12-26 00:29:57 -05:00
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
eb5a7b4276
Added Legend package for support.
...
Refactored Key/Chest commands and added FrostLord package.
Removed password, added whitelist.
2014-12-24 03:41:17 -05:00
6e93d85da8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-24 02:49:37 -05:00
008980d9ca
Slowed Server page update speed.
2014-12-24 01:36:33 -05:00
5446557b89
Merge remote-tracking branch 'origin/master'
2014-12-23 17:48:59 -06:00
043f67f78c
Fix for max players not displaying properly (MPS)
2014-12-23 17:48:38 -06:00
adc5769890
Fix wither not accessible for ranks, fix wither having weird naming in inventories
2014-12-24 04:07:28 +13:00
d83b586a3a
Merge remote-tracking branch 'origin/master'
2014-12-23 08:08:00 -06:00
cff63ca3e3
Phinary needs some sleep!
2014-12-23 08:07:46 -06:00
a1dd1b8753
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 08:08:48 -05:00
5dcda626e7
Fixed port stuff for MPS
2014-12-23 08:08:41 -05:00
1a3920d04a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 23:45:11 +11:00
35bcf28c83
champions builds will now load in MPS, even if the current game isnt champs.
2014-12-23 23:44:59 +11:00
9c1e3aa7aa
Ignore full or dead servers
2014-12-23 06:26:51 -06:00
d40b154902
Merge remote-tracking branch 'origin/master'
2014-12-23 06:20:43 -06:00
c40a5a8eac
Another bugfix
2014-12-23 06:20:36 -06:00
78977788a1
fixed bug
2014-12-23 23:18:29 +11:00
f4c5922b05
added messages for when server is expired
2014-12-23 23:17:21 +11:00
78d94320a8
fixed reciptient of message
2014-12-23 22:55:07 +11:00
ea6214b2ad
Merge remote-tracking branch 'origin/master'
2014-12-23 05:49:08 -06:00
582ed34d21
Fix for staff hosted
2014-12-23 05:48:45 -06:00
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
4bfd34034b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 22:19:50 +11:00
8c2d879036
added ownership of legend particle for legends.
2014-12-23 22:17:39 +11:00
50993d19f3
Added Legend for Enjin
2014-12-23 06:07:14 -05:00
d2e078f890
Fixed ranks for MPS
2014-12-23 06:04:42 -05:00
fb841c3831
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
2014-12-23 05:57:45 -05:00
bb8b1d60f9
30 seconds recharge on ability to host locally.
2014-12-23 05:56:17 -05:00
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
d8311d860e
Ignore private servers
2014-12-23 04:21:37 -06:00
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
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
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
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
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
6b5b072ae8
missing file
2014-12-23 19:36:23 +11:00
7496f64d58
benefit
2014-12-23 19:36:10 +11:00
a15256da88
update
2014-12-23 19:04:10 +11:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
2a585936b7
Maybe I should test before I commit!
2014-12-23 00:37:29 -06:00
2848ec2751
Use the correct data value this time!
2014-12-23 00:33:47 -06:00
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
8f9794a5f7
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
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
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
befc2cff7c
messing with jedis subpub
2014-12-22 22:49:28 -06:00
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
f961fd0233
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
0659f497c0
frost lord update
2014-12-23 15:00:32 +11:00
19a7e6d666
time update
2014-12-23 13:01:44 +11:00
8ed7f34ab6
Sorted game pages
2014-12-22 19:20:08 -06:00
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
825b25e8d1
fixed my bug in miniplugin
2014-12-23 11:29:48 +11:00
71cf8e8fd2
undid champs stuff :(
2014-12-23 11:22:41 +11:00
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
0f5c33fe52
derp derp chissderp
2014-12-22 17:41:12 -06:00
b51367f33b
Add missing jooq classes
2014-12-22 17:40:04 -06:00
31b040c654
Merge remote-tracking branch 'origin/master'
2014-12-22 17:37:10 -06:00
1396c3395a
Add kill button, rename ban to remove, add some messages for actions, add remove admin
2014-12-22 17:37:02 -06:00
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
9a9936bc8c
Allow animated motd to be enabled or disabled through database
2014-12-22 16:39:34 -06:00
3efc80ec58
Update jooq database classes
2014-12-22 16:11:59 -06:00
b83a81ec7e
Fixed little conflict issue.
2014-12-22 09:25:02 -05:00
9b3350c8c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-22 09:22:50 -05:00
d920439ec5
Clans update. Laying groundwork for energy
2014-12-22 09:22:10 -05:00
fa0a9ac859
fixed exploit on skylands
2014-12-22 21:08:44 +11:00
ec8e1f0546
more MPS stuff
...
fixed bridges exploit
2014-12-22 16:31:13 +11:00
2472ca95ec
MPS updates
2014-12-22 13:19:45 +11:00
4a50e3ae62
Merge branch 'chissbrokethis'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:57:39 +11:00
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
0e7dec919d
minor updates
2014-12-22 10:51:19 +11:00
71f7b4c963
legend join messages
2014-12-22 10:40:06 +11:00
1a56f074b3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-22 10:22:13 +11:00
eba54c6b8a
Removed hub snake parkour
2014-12-22 10:21:58 +11:00
9321abdaf5
Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy
2014-12-19 13:59:31 +11:00
184c6cb4ba
added func to change attackreason for combatmanager
2014-12-19 13:59:18 +11:00
52cc0862d7
Memory leak fix for CUSTOM TAG
2014-12-18 18:29:33 -05:00
93314711e7
Modified snd
2014-12-18 17:56:21 +13:00
4c4ba34d39
Merge pull request #5 from feature/chatslow to master
...
* commit '9ef0ea629c57b148d815b93a455f9817ce512960':
Added changes from master to Chat
Chat Slow Command
2014-12-17 20:08:32 -06:00
9ef0ea629c
Added changes from master to Chat
2014-12-17 20:07:39 -06:00
899add5fcd
Merging changes from master
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
2014-12-17 20:07:11 -06:00
437c1aeabe
MPS rank todo
2014-12-18 13:06:57 +11:00
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
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
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
604243dfa3
UI improvements - icon changes, whitelist toggle, notify messages
2014-12-17 19:42:11 -06:00
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
Ty Sayers
CoderTim
libraryaddict
Jonathan Williams
Mini-Chiss
Shaun Bennett
Chiss