Commit Graph

4644 Commits

Author SHA1 Message Date
Jonathan Williams
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
Shaun Bennett
9cf62cfe7f Don't use player skulls until caching is setup and working properly 2015-11-01 22:58:22 -05:00
Cheese
cdb0fcae75 modified hideme a little :) 2015-11-02 14:37:12 +11:00
Sarah
da6bf27c77 Staff with a higher rank can see lower rank and same ranked vanished staff. 2015-11-02 04:32:07 +01:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
Jonathan Williams
5c2ade8270 Updated staff list. 2015-10-31 14:55:34 -05:00
Jonathan Williams
f16eee220d Removed Debug messages. 2015-10-31 14:55:18 -05:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Cheese
92a2c2ebaa fixed npe in kit npc creation 2015-10-31 19:55:58 +11:00
Cheese
b8b260bca1 fixed expire time on projectiles 2015-10-31 19:01:49 +11:00
Cheese
c463b80fe0 fixed insta-expire 2015-10-31 19:00:28 +11:00
Cheese
5d58c56c27 fixed kit bug 2015-10-31 18:31:13 +11:00
Cheese
3636fdfba0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-31 18:23:06 +11:00
Cheese
225f067ab3 fixed some projectile stuff 2015-10-31 18:22:53 +11:00
Shaun Bennett
cd15df0238 Merge remote-tracking branch 'origin/master' 2015-10-31 02:13:24 -04:00
Shaun Bennett
71e49854db Add halloween hats 2015-10-31 02:10:15 -04:00
Shaun Bennett
bce439d0cf Merge pull request #70 in MIN/mineplex from Myst_TRICKORTREAT2 to master
* commit '1a6617bce1af68b0665323d59b956daf290ca91f':
  Changes.
2015-10-31 01:07:55 -05:00
Mysticate
1a6617bce1 Changes. 2015-10-31 02:05:03 -04:00
libraryaddict
519dceb72e Doublejumping downwards is a no no 2015-10-31 19:02:58 +13:00
Cheese
23be8aa1dd removed unncessary stuff
balanced rewards
2015-10-31 14:33:41 +11:00
Cheese
a92a52f009 Merge branch 'Myst_TRICKORTREAT' 2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00
Cheese
b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
libraryaddict
0dfd5387f3 Update patches 2015-10-30 20:26:13 +13:00
libraryaddict
301b8012ff Final commit 2015-10-30 19:30:17 +13:00
libraryaddict
ea1e4b79f7 Changes from SnD branch 2015-10-30 19:25:02 +13:00
libraryaddict
ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +13:00
libraryaddict
da0a99d662 Spawn facing fixes 2015-10-30 16:06:47 +13:00
libraryaddict
50edf557ab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-30 15:57:36 +13:00
libraryaddict
388aa1611c Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate 2015-10-30 15:44:37 +13:00
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
Cheese
dc535ff861 art 2015-10-30 12:59:58 +11:00
AlexTheCoder
0be51d5629 - Even more bugfixes 2015-10-29 16:48:51 -04:00
Shaun Bennett
e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
libraryaddict
7fca42b0e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
2015-10-29 21:41:59 +13:00
libraryaddict
14df456b3d Progres 2015-10-29 21:39:38 +13:00
Aaron Brock
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
Aaron Brock
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
Aaron Brock
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
AlexTheCoder
cf26541461 - More Bugfixes 2015-10-28 18:16:52 -04:00
libraryaddict
0486404c4b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-10-28 14:38:34 +13:00
libraryaddict
5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13:00
AlexTheCoder
0ab3213b7b - Fixed permanent dwarf toss bug
- Fixed skills being active while player is editing class
2015-10-27 01:38:41 -04:00
AlexTheCoder
9d6a361602 - Fixed emerald jump for Relyh 2015-10-26 23:42:52 -04:00
AlexTheCoder
7770fa0284 - Added system to ensure banned players are removed from the network 2015-10-26 07:09:01 -04:00
AlexTheCoder
f5b4f28848 - Fixed achievements
- Various balance patches/audio changes
2015-10-26 00:25:33 -04:00
AlexTheCoder
57da1d195a - Resolved randomly using java 8 in this one plugin 2015-10-24 20:50:47 -04:00
AlexTheCoder
08fd1b5790 - Fixed MPS Whitelist for usernames with non-lowercase characters 2015-10-24 20:49:09 -04:00
Shaun Bennett
556d5adcd9 Change /global to /globalpacket (fixes conflict with announcement command) 2015-10-24 17:46:25 -04:00
Shaun Bennett
0d56eefd44 Titan/Rewards adjustments 2015-10-24 13:40:17 -04:00