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

1142 Commits

Author SHA1 Message Date
libraryaddict
d6c3b330b5 Fix redis working on the same thread 2015-03-02 03:44:38 +13:00
Jonathan Williams
789e750cbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-01 01:09:28 -08:00
libraryaddict
3f7eceb907 Disable redis being sent for player messaging and parties. 2015-03-01 17:40:52 +13:00
libraryaddict
3b4075392a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-01 15:16:15 +13:00
Jonathan Williams
e5189bea40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-28 10:26:25 -08:00
Shaun Bennett
81a7e1f1f2 Better hover effect for treasure chests - also fixes hover only showing for old chests 2015-02-28 00:37:22 -05:00
Shaun Bennett
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
Shaun Bennett
c916957a07 Fix block morph with treasure chests 2015-02-27 23:22:45 -05:00
Shaun Bennett
90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
libraryaddict
d23d146f35 Fix up admin message typos 2015-02-27 21:12:31 +13:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
libraryaddict
d9184ad423 Disable /a for muted players 2015-02-25 23:20:40 +13:00
Shaun Bennett
cf7e2eed69 Merge with MPS Update 2015-02-24 21:11:16 -05:00
Shaun Bennett
45fd3cc537 Revert "Update JOOQ files, update IntelliJ config file for JIRA" 
This reverts commit db3f2989c0.
 2015-02-24 21:03:59 -05:00
libraryaddict
bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
Shaun Bennett
cea172a713 Give more cpu to SnrMod+/Youtube private servers 2015-02-24 17:39:02 -05:00
Shaun Bennett
47ef3617f4 Give SnrMod+/Youtube servers 2GB of ram instead of 1GB 2015-02-24 14:43:38 -05:00
Shaun Bennett
48dd5639d2 Kick banned players from games 2015-02-24 14:38:12 -05:00
libraryaddict
fc5771b33c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-24 13:04:06 +13:00
libraryaddict
56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
Jonathan Williams
e1818a9c32 Fixed stat overrite bug. 2015-02-23 00:45:45 -08:00
Jonathan Williams
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
Ty Sayers
e1f7e2dbcc Remove old lines of debug code. 2015-02-19 18:55:21 -05:00
Ty Sayers
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
libraryaddict
0aee8042b5 Changed /locate to return the located players name, not fed target 2015-02-18 09:27:58 +13:00
libraryaddict
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
libraryaddict
3b0a131ca2 If private messaging is turned off, deny messages, even from friends. 2015-02-15 22:10:15 +13:00
libraryaddict
3ef3689e6d Fixed RedisMessageCallback not being registered 2015-02-15 22:01:10 +13:00
Jonathan Williams
fd0547d9d3 Added connection re-establishment to database calls if error occurs. 2015-02-14 22:50:52 -08:00
Jonathan Williams
c129deb201 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-14 22:05:24 -08:00
Jonathan Williams
17543910b5 Added Chest packages to support server. 
Fixed Punish not loading.
 2015-02-14 15:09:42 -08:00
Mini-Chiss
e33fd3f249 disallow people from talking about hacks in chat. 2015-02-15 09:01:55 +13:00
libraryaddict
0071d6220d Change locate command to moderators and up 2015-02-14 22:22:15 +13:00
Jonathan Williams
6ff0928fbd Fixed RB with exemption in NCP hooks. 2015-02-14 00:48:07 -08:00
libraryaddict
0cd0c61200 Add /locate|where|find command to find other players in other servers 2015-02-13 20:57:46 +13:00
Shaun Bennett
db3f2989c0 Update JOOQ files, update IntelliJ config file for JIRA 2015-02-12 14:17:04 -05:00
libraryaddict
876005b3e3 Fixed sending admin cross-server messages not setting last admin to 2015-02-12 22:27:09 +13:00
libraryaddict
858a6fb674 Fixed FriendsGUI not removing ghost items when redrawing page 2015-02-12 04:08:43 +13:00
libraryaddict
9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
libraryaddict
1b11c5dbbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-12 04:06:19 +13:00
libraryaddict
f41473da8f Add message to unignore when no parameters are given 2015-02-11 23:11:21 +13:00
Jonathan Williams
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
Shaun Bennett
1b4d1d94e9 Merge remote-tracking branch 'origin/master' 2015-02-10 21:15:53 -05:00
Shaun Bennett
58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Jonathan Williams
86b0a578ba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 18:13:49 -08:00
Mini-Chiss
264ecfc362 lowered legendary chance on old chest slightly 2015-02-11 15:13:33 +13:00
Jonathan Williams
f0d2ff1c9d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:44:36 -08:00
Mini-Chiss
500e37a618 fixed ender chest shop item 2015-02-11 14:44:14 +13:00
Mini-Chiss
92d3a7dab8 all chests purchasable by coins 2015-02-11 14:42:41 +13:00
Mini-Chiss
cafa59d7e8 adjusted reward rarities 2015-02-11 14:16:08 +13:00
Jonathan Williams
258c1ca7fc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:27:05 -08:00
Mini-Chiss
d9521bd05a lowered gameloot chances 2015-02-10 23:26:37 +13:00
Jonathan Williams
4c0e6642f4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:12:23 -08:00
Jonathan Williams
3a912c13ec Add nocheat to MPS 2015-02-10 02:11:27 -08:00
Shaun Bennett
336ba50f59 Rename some enum values for treasures, update my packet change 2015-02-09 23:24:43 -05:00
Mini-Chiss
cb9246281c TEASURE! +R 2015-02-10 16:49:50 +13:00
Mini-Chiss
37a5024fcd more chest polish 2015-02-10 13:22:42 +13:00
Mini-Chiss
04d0a1cba1 fixed lore 2015-02-10 12:40:51 +13:00
Mini-Chiss
edddff503e Treasure ready ;o 2015-02-10 12:38:08 +13:00
Mini-Chiss
c1f9f94c2a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 12:23:28 +13:00
Mini-Chiss
6bbf9bd321 Ability to purchase old chests 2015-02-10 12:23:11 +13:00
Mini-Chiss
af95d3ba4e Treasure update 2015-02-10 12:09:37 +13:00
libraryaddict
c2c63f4fc0 Null check in MessageManager 2015-02-10 04:17:38 +13:00
libraryaddict
29f3241098 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7 Add commands /ignore and /unignore. Fixed mutes not working with private messaging 2015-02-10 02:31:33 +13:00
libraryaddict
cf0134a577 Change commandmanager to cancel event if command is registered, despite not having permissions 2015-02-10 02:20:54 +13:00
Jonathan Williams
51e1798d8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-09 00:19:15 -08:00
Jonathan Williams
c5b7e97623 Added NoCheatPlus hooks. 2015-02-09 00:18:51 -08:00
Jonathan Williams
fcba1db291 Fixed server transfer bug. 2015-02-09 00:15:45 -08:00
Jonathan Williams
f98d6e0534 Fixed personal servers overriding existing servergroups. 2015-02-09 00:15:18 -08:00
Mini-Chiss
26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Shaun Bennett
c285fae035 Merge remote-tracking branch 'origin/master' 2015-02-06 23:40:14 -05:00
Shaun Bennett
b85494a037 Show player skins in friend gui 2015-02-06 23:40:06 -05:00
Shaun Bennett
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
libraryaddict
219ac93dc4 Don't allow the server to increment the mapcount information. 2015-02-07 16:06:53 +13:00
libraryaddict
c61f97d0eb Why didn't this get included in that previous commit.. 2015-02-07 03:54:19 +13:00
libraryaddict
8851cccff4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-07 03:53:17 +13:00
libraryaddict
68d1ba4507 Add API to create walls of maps to create a giant image. Please use responsibly. 2015-02-07 03:52:19 +13:00
Shaun Bennett
de1d2d4688 Just ignore this commit. Nothing fancy here! 2015-02-06 00:42:17 -05:00
Shaun Bennett
36b43af2c2 Fix inconsistency in friends gui 2015-02-06 00:14:46 -05:00
Shaun Bennett
48db23c862 Fix for enderchests closing after being opened, go shaun! 2015-02-06 00:10:17 -05:00
Shaun Bennett
922f2d5ee9 Merge remote-tracking branch 'origin/master' 2015-02-05 23:20:45 -05:00
Shaun Bennett
fcb3d20778 Move tablist stuff to portal, show current server on tablist 2015-02-05 23:20:39 -05:00
Chiss
14fc6f2145 Chest Update 2015-02-06 14:16:10 +11:00
Jonathan Williams
44bab01e33 Added NoCheatPlus hook for double jump fly hack prevention. 2015-02-04 21:52:14 -08:00
Chiss
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
Chiss
c7d4b14f4c Revert "Revert "Work on treasure............"" 
This reverts commit 49bfe385bf.
 2015-02-05 11:34:29 +11:00
libraryaddict
e91d76960c Add a toggleable friends GUI - Chat to Inventory and back 2015-02-03 22:03:07 +13:00
libraryaddict
ea24bc1d87 Prevent treasure chests being opened from interfering with portals, ladders, etc. 2015-02-01 12:19:33 +13:00
libraryaddict
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
Jonathan Williams
ff56578d15 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-29 22:29:12 -08:00
Jonathan Williams
49bfe385bf Revert "Work on treasure............" 
This reverts commit 50a8fb03a9.

REVERT ALL SHAUNS CRAP.
 2015-01-29 22:28:41 -08:00
libraryaddict
ff73c88182 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-30 19:28:29 +13:00
libraryaddict
a1529e0884 Notify player when no friends found when searching 2015-01-30 19:28:04 +13:00
Jonathan Williams
352a29390b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-29 22:19:12 -08:00
Jonathan Williams
ed08e4b112 Changed coloring for server line in friends gui. 2015-01-29 22:18:59 -08:00
Shaun Bennett
96ce95b72e treasure changes 2015-01-30 00:37:02 -05:00
Shaun Bennett
79a60db15d More tweaks 2015-01-29 22:41:54 -05:00
Shaun Bennett
1cc0879ce9 treasure stuff 2015-01-29 22:17:46 -05:00
Jonathan Williams
81a52184c9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-29 17:50:24 -08:00