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
NewGarbo
878f7aeafd
Potentially fixed the problem where your NPC skeleton sticks around after you log in, and attacks you.
2015-10-30 22:48:40 +00:00
NewGarbo
f54da4ee78
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-30 22:20:33 +00:00
NewGarbo
396ce75087
Bug fixes/Additions:
...
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
2015-10-30 22:13:19 +00: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
Keir
ec5cbbe684
This method is not required, "Plugin" is protected, not private as I previously assumed.
2015-10-30 01:05:45 +00:00
Keir
e266acaf44
Store report categories with a TINYINT to save space and increase lookup performance.
2015-10-29 23:33:23 +00:00
Keir
e8c01a1733
Cleanup imports.
2015-10-29 23:29:38 +00:00
AlexTheCoder
0be51d5629
- Even more bugfixes
2015-10-29 16:48:51 -04:00
Keir
1857afa826
Log report category to database.
...
Allow report to easily be handled by clicking text to fire the reporthandle command.
2015-10-29 17:51:17 +00:00
Shaun Bennett
401350e85d
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-29 13:14:33 -04:00
Shaun Bennett
364d8b05af
Fix war invasion
2015-10-29 13:14:27 -04:00
Shaun Bennett
e2947718fe
Remove code that wasnt meant to be commited
2015-10-29 13:10:10 -04:00
NewGarbo
66a4b148e1
Fixed put on armour task being inconsistent.
2015-10-29 13:44:11 +00:00
NewGarbo
0c5e34ad84
Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones!
2015-10-29 12:56:00 +00:00
Keir
d23230504f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-10-29 12:20:27 +00: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
NewGarbo
d0bfb2e2e9
Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event.
2015-10-29 08:35:24 +00: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
NewGarbo
a063da4cae
Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts.
2015-10-28 22:55:10 +00:00
NewGarbo
afadd61431
Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int.
2015-10-28 22:47:30 +00:00
AlexTheCoder
cf26541461
- More Bugfixes
2015-10-28 18:16:52 -04:00
NewGarbo
cffcf245e9
UtilItem.java overhaul, complete item attribute system added.
2015-10-28 22:14:08 +00:00
NewGarbo
8ce50d1fc7
Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.)
2015-10-28 17:08:48 +00:00
Keir
38425f25fe
Add missing child overridden methods for chaining.
2015-10-28 16:03:02 +00:00
NewGarbo
765fb4ce11
Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items.
...
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
2015-10-28 07:34:13 +00: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
Keir
dd321439a6
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-10-27 22:40:23 +00:00
Keir
4ceb8f20aa
Make ReportNotification capable of sending json messages.
2015-10-27 22:26:02 +00:00
Keir
cb1c779f37
Close player report if the reported player leaves the game mid-report.
2015-10-27 22:15:06 +00:00
Keir
d9fb0adabb
Only notify staff if 3 or more players report a player.
2015-10-27 22:14:33 +00:00
Keir
53f2356cba
Handle null report closers.
2015-10-27 22:08:42 +00:00
Keir
bc3a119a22
Store report category and only "merge" reports when the category is the same.
2015-10-27 17:30:47 +00:00
NewGarbo
8d5b6e6d90
Don't show weakling particles above players that are not alive. Also removed debug message.
2015-10-27 10:18:14 +00:00
NewGarbo
1938bcf799
Fixed the "weakling" status not updating correctly.
2015-10-27 10:01:33 +00:00
NewGarbo
b4897e91fa
Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately.
2015-10-27 08:56:41 +00:00
