2a7b272de3
Merge remote-tracking branch 'origin/master'
2015-11-09 01:55:36 -05:00
752d8152d2
Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
Fix for some preferences not applying correctly.
2015-11-08 08:23:20 -06:00
3c82574386
Testing pushing/ignore this
2015-11-07 20:02:07 -05:00
bf97cf5d77
Remove debug code
2015-11-07 13:53:34 -05:00
e1f56a5d5a
Merge remote-tracking branch 'origin/master'
2015-11-07 01:10:34 -05:00
ec7600a4a2
Giveaway tweaks
2015-11-07 01:10:27 -05:00
c922c3248c
disabled trick or treat
2015-11-07 13:36:16 +11:00
f4bf685e96
removed halloween hub
...
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
4add7449eb
Merge remote-tracking branch 'origin/master'
2015-11-06 21:15:45 -05:00
3893617d58
Logitech Giveaway (still needs testing)
2015-11-06 21:15:37 -05:00
783bec75db
Fix for some preferences not applying correctly.
2015-11-06 23:04:51 +00:00
93ff7c32b5
Merge pull request #71 in MIN/mineplex from alex-bugfixes to master
...
* commit 'c518221f6b6d11da83b686445f54d702c35a3d3e':
- Fix Merge Error
- Fixed MPS Whitelist
- Resolved randomly using java 8 in this one plugin
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-11-02 23:22:21 -06:00
c518221f6b
- Fix Merge Error
2015-11-02 22:14:48 -05:00
c41d01e213
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes
...
Conflicts:
Plugins/Mineplex.StaffServer/.classpath
2015-11-02 22:09:18 -05:00
89c9f19c69
- Fixed MPS Whitelist
2015-11-02 22:08:02 -05:00
8838ea75e4
Some code cleanup for tasks.
2015-11-02 09:37:11 -06:00
3b38302429
Optimized TaskManager task locks and calls.
...
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
55d028d706
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-01 22:09:58 -06:00
3a0b8d75a2
Added new support member.
2015-11-01 22:09:50 -06:00
18bdcbec62
Fixed some NPEs with TrickDialogue
...
Added debug messages for Tricks.
Cleanup of monster targets in HubManager.
2015-11-01 22:09:36 -06:00
9cf62cfe7f
Don't use player skulls until caching is setup and working properly
2015-11-01 22:58:22 -05:00
cdb0fcae75
modified hideme a little :)
2015-11-02 14:37:12 +11:00
da6bf27c77
Staff with a higher rank can see lower rank and same ranked vanished staff.
2015-11-02 04:32:07 +01:00
cb96124feb
Added extra cleanup for FriendsGUI and AddFriendPage
2015-11-01 17:42:23 -06:00
5c2ade8270
Updated staff list.
2015-10-31 14:55:34 -05:00
f16eee220d
Removed Debug messages.
2015-10-31 14:55:18 -05:00
073321fb14
Refactored TrickOrTreat Stuff.
2015-10-31 14:45:42 -05:00
92a2c2ebaa
fixed npe in kit npc creation
2015-10-31 19:55:58 +11:00
b8b260bca1
fixed expire time on projectiles
2015-10-31 19:01:49 +11:00
c463b80fe0
fixed insta-expire
2015-10-31 19:00:28 +11:00
5d58c56c27
fixed kit bug
2015-10-31 18:31:13 +11:00
3636fdfba0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-31 18:23:06 +11:00
225f067ab3
fixed some projectile stuff
2015-10-31 18:22:53 +11:00
cd15df0238
Merge remote-tracking branch 'origin/master'
2015-10-31 02:13:24 -04:00
71e49854db
Add halloween hats
2015-10-31 02:10:15 -04:00
bce439d0cf
Merge pull request #70 in MIN/mineplex from Myst_TRICKORTREAT2 to master
...
* commit '1a6617bce1af68b0665323d59b956daf290ca91f':
Changes.
2015-10-31 01:07:55 -05:00
1a6617bce1
Changes.
2015-10-31 02:05:03 -04:00
23be8aa1dd
removed unncessary stuff
...
balanced rewards
2015-10-31 14:33:41 +11:00
a92a52f009
Merge branch 'Myst_TRICKORTREAT'
2015-10-31 14:27:06 +11:00
4884032a1a
Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3
2015-10-30 23:24:32 -04:00
b9d7c80f80
cow kit
2015-10-31 13:25:57 +11:00
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
dc535ff861
art
2015-10-30 12:59:58 +11:00
e2947718fe
Remove code that wasnt meant to be commited
2015-10-29 13:10:10 -04:00
acc915c34e
Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.
2015-10-29 01:12:12 -04:00
8dd80094b4
Fixed a little boolean derp that stopped people from breaking blocks.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd
2015-10-28 23:26:18 -04:00
9df297fc11
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6
2015-10-28 23:25:56 -04:00
57da1d195a
- Resolved randomly using java 8 in this one plugin
2015-10-24 20:50:47 -04:00
08fd1b5790
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-10-24 20:49:09 -04:00
556d5adcd9
Change /global to /globalpacket (fixes conflict with announcement command)
2015-10-24 17:46:25 -04:00
Shaun Bennett
libraryaddict
Cheese
Shaun Bennett
Keir
AlexTheCoder
Jonathan Williams
Sarah
Mysticate
Aaron Brock