Shaun Bennett
|
11e1e53a36
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-12-05 21:36:19 -05:00 |
|
Shaun Bennett
|
d5a9a92913
|
Forgot to push these changes last update!
|
2015-12-05 21:36:07 -05:00 |
|
NewGarbo
|
bca65116ab
|
fixed task not getting cleanup up after /skiptutorial
|
2015-12-04 18:23:23 +00:00 |
|
NewGarbo
|
e158704534
|
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
|
2015-12-04 15:58:51 +00:00 |
|
NewGarbo
|
3b125dc8a5
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
|
2015-12-04 11:12:19 +00:00 |
|
Shaun Bennett
|
2435ebba13
|
Disable subtasks for now
|
2015-12-04 05:16:14 -05:00 |
|
Shaun Bennett
|
5c575b41fc
|
Clans alpha 0.17
|
2015-12-04 05:15:28 -05:00 |
|
NewGarbo
|
39daf969fd
|
clan claim visualizer
|
2015-12-03 22:29:36 +00:00 |
|
NewGarbo
|
584a02ae3e
|
fixed infinite claims
|
2015-12-03 10:30:06 +00:00 |
|
NewGarbo
|
92c1abf221
|
a few last touches
|
2015-12-02 06:04:53 +00:00 |
|
NewGarbo
|
8db5ffe5c7
|
forcejoin command for ADMIN+ and fixed auto tree replanting.
|
2015-12-02 05:54:00 +00:00 |
|
NewGarbo
|
3a4e453ac3
|
made it so that you can only use /reset in safe zones
|
2015-12-02 05:18:04 +00:00 |
|
NewGarbo
|
b8e2086928
|
changes to tutorial
|
2015-12-02 00:19:48 +00:00 |
|
NewGarbo
|
ba27d94158
|
fixed skiptutorial message not displaying
|
2015-12-01 23:23:11 +00:00 |
|
NewGarbo
|
cffb6bd62f
|
bunch o' changes
|
2015-12-01 23:01:41 +00:00 |
|
NewGarbo
|
a7d6026c07
|
made skip tutorial messages be seen whilst in tutorial
|
2015-12-01 22:33:47 +00:00 |
|
NewGarbo
|
35ae89ab1f
|
fixed players from being able to eat their carrot in the making money task
|
2015-12-01 19:37:53 +00:00 |
|
NewGarbo
|
ea099d7a82
|
fixed some annoying bugs and fixed certain messages not showing in tutorial
|
2015-12-01 18:41:33 +00:00 |
|
NewGarbo
|
fbf9c8eb0c
|
made certain messages visible in tutorial that are actually required to be seen
|
2015-12-01 13:37:34 +00:00 |
|
NewGarbo
|
d32e6fdb96
|
Got rid of deployed tasks. using different system now. (untested)
|
2015-12-01 11:28:14 +00:00 |
|
NewGarbo
|
1a851679c4
|
made it so players cannot see chat whilst in tutorial
|
2015-11-30 20:40:30 +00:00 |
|
NewGarbo
|
6eb44ed87b
|
whoops.. this isn't php hehe
|
2015-11-30 19:11:18 +00:00 |
|
NewGarbo
|
813e7ee789
|
made it so that no messages are shown when in tutorial
|
2015-11-30 19:08:16 +00:00 |
|
NewGarbo
|
be727e6e26
|
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
|
2015-11-29 19:46:08 +00:00 |
|
Jonathan Williams
|
1d1a1d96f8
|
Fixed onAbilityUsed bug with _player (presumably because it was added to cull and _player was set to null right before SkillTriggerEvent happened.)
|
2015-11-29 02:39:37 -06:00 |
|
Jonathan Williams
|
5b04a3223d
|
Fixed bug with Posion effect NPE (Something in champs is adding a null source).
Fixed bug with Tutorial cleanup.
|
2015-11-29 02:29:47 -06:00 |
|
Shaun Bennett
|
f82396d485
|
Clans changes/fixes
|
2015-11-29 02:41:53 -05:00 |
|
NewGarbo
|
b88a842f1c
|
stuff
|
2015-11-29 03:22:52 +00:00 |
|
NewGarbo
|
c870d99e0e
|
teleport stuff
|
2015-11-29 02:55:45 +00:00 |
|
NewGarbo
|
a9afe1f068
|
added self clan create/delete messages
|
2015-11-29 02:54:40 +00:00 |
|
NewGarbo
|
392ab601c2
|
tutorial tasks reset
|
2015-11-29 02:43:12 +00:00 |
|
NewGarbo
|
dc5aec33b4
|
tutorial ending message
|
2015-11-29 02:37:20 +00:00 |
|
NewGarbo
|
9ff9724fc8
|
tutorial revamp 2.0
|
2015-11-29 02:10:39 +00:00 |
|
NewGarbo
|
d8ae035f84
|
creative scoreboard team. and fixed npe in tutorials
|
2015-11-28 09:20:42 +00:00 |
|
NewGarbo
|
a0ae500876
|
tutorial revamp [clans]
|
2015-11-28 09:03:58 +00:00 |
|
NewGarbo
|
260002c9cf
|
final changes
|
2015-11-27 21:02:20 +00:00 |
|
NewGarbo
|
fe085c1571
|
loaaads of stuff
|
2015-11-27 19:42:15 +00:00 |
|
NewGarbo
|
0c463cf7cd
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 14:24:25 +00:00 |
|
NewGarbo
|
ad0c161f16
|
set players time to day during tutorial
|
2015-11-27 13:28:37 +00:00 |
|
NewGarbo
|
691105b2cb
|
force place bed on first claim
|
2015-11-27 13:23:37 +00:00 |
|
Cheese
|
ab3d2ba098
|
updated tutorials.
added worldmanager to cull entities.
|
2015-11-28 00:23:18 +11:00 |
|
Shaun Bennett
|
b996dc20ca
|
Enable tutorial, fix stuck command
|
2015-11-27 06:26:32 -05:00 |
|
NewGarbo
|
0274bf2847
|
loads of changes.
|
2015-11-27 03:28:19 +00:00 |
|
NewGarbo
|
e849484670
|
bunch of changes and fixes and bugs and stuff and things
|
2015-11-26 23:59:47 +00:00 |
|
NewGarbo
|
055702b36e
|
changes and fixes and woo
|
2015-11-26 23:08:33 +00:00 |
|
NewGarbo
|
2bce722539
|
some code polishing. fixed some mispositioning with Spawn holograms.
|
2015-11-26 13:29:40 +00:00 |
|
NewGarbo
|
009ddaaee1
|
stop players in tutorial from receiving/sending chat.
|
2015-11-26 13:16:50 +00:00 |
|
NewGarbo
|
1e4b6b4d0f
|
fixed formatting error in clan tip
|
2015-11-26 05:30:13 +00:00 |
|
Shaun Bennett
|
cc75bafb4c
|
Bugs and thugs
|
2015-11-25 16:45:04 -05:00 |
|
NewGarbo
|
c5211e0368
|
buuugs
|
2015-11-25 17:40:12 +00:00 |
|