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
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
cf7e2eed69
Merge with MPS Update
2015-02-24 21:11:16 -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
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
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
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
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
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
17543910b5
Added Chest packages to support server.
...
Fixed Punish not loading.
2015-02-14 15:09:42 -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
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
cafa59d7e8
adjusted reward rarities
2015-02-11 14:16:08 +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
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
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
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
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
44bab01e33
Added NoCheatPlus hook for double jump fly hack prevention.
2015-02-04 21:52:14 -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
e91d76960c
Add a toggleable friends GUI - Chat to Inventory and back
2015-02-03 22:03:07 +13:00
ea24bc1d87
Prevent treasure chests being opened from interfering with portals, ladders, etc.
2015-02-01 12:19:33 +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
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
96ce95b72e
treasure changes
2015-01-30 00:37:02 -05: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
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +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
58a8a32e93
Added cross-server Announcements and Global messages.
2015-01-24 01:44:22 -08:00
39d1a48bc1
Added cross-server instant punishments.
...
[Punish] Banning doesn't kick.
2015-01-23 23:33:24 -08:00
34cd48cfb6
Fix for duplicate check.
2015-01-23 01:17:27 -08: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
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
a1f2a3a2a1
Clan Energy
2015-01-22 20:34:44 -05:00
d90a46252e
Allow commands to pass when muted.
2015-01-19 00:50:05 -08:00
9b4f1a491e
Add new method to Hologram - Remove hologram on entity death
2015-01-18 21:23:47 +13: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
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
e14dfcf313
Fixed Lobby sending with Portal.
2015-01-12 09:55:32 -08: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
8de8d31eec
Added pool based repository and converted everything but account and donation repositories to it.
2015-01-10 11:53:25 -08:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11: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
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
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
adc5769890
Fix wither not accessible for ranks, fix wither having weird naming in inventories
2014-12-24 04:07:28 +13:00
5dcda626e7
Fixed port stuff for MPS
2014-12-23 08:08:41 -05: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
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
libraryaddict
Jonathan Williams
Shaun Bennett
Ty Sayers
Mini-Chiss
Chiss