NewGarbo
c63bac6433
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-15 11:42:16 +00:00
NewGarbo
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
NewGarbo
667f076202
fixed unsafe timer
2015-12-09 10:46:05 +00:00
Shaun Bennett
b22c64ca6a
Fix excludes
2015-12-08 05:51:21 -05:00
Shaun Bennett
a84f580719
Update IntelliJ to Java 8
2015-12-08 05:45:26 -05:00
Shaun Bennett
eed6966a5b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-07 13:21:17 -05:00
Shaun Bennett
c3ace42a68
Winter MOTD, Stat fixes (maybe?!)
2015-12-07 13:21:11 -05:00
NewGarbo
425463d339
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-06 19:11:13 +00:00
NewGarbo
a9c7f088f3
made use ability teleport player back to where they should be
2015-12-06 19:10:18 +00:00
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
5d59b1a015
fixed tnt blowing up in claims when offline
2015-12-04 18:32:46 +00:00
NewGarbo
bca65116ab
fixed task not getting cleanup up after /skiptutorial
2015-12-04 18:23:23 +00:00
Shaun Bennett
f57f4ed0aa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-04 12:10:10 -05: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
Shaun Bennett
bb382a969c
Fix heavy attribute, disable claim visualizer
2015-12-04 08:02:38 -05: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
e9fd661311
disabled koth
2015-12-02 18:25:53 +00:00
NewGarbo
8fea5afdce
fixed message on tick (might be cause of laggg)
2015-12-02 06:56:58 +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
d6ca52e4a4
modifications
2015-12-02 05:11:09 +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
69cb395f5a
made entire clan know about disband
2015-12-01 22:30:05 +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
f536bf23e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96
Got rid of deployed tasks. using different system now. (untested)
2015-12-01 11:28:14 +00:00
Jonathan Williams
633697dc7a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 23:49:32 -06:00
Jonathan Williams
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
Cheese
51023a7630
cosmetic cooldown fix
2015-12-01 15:38:54 +11:00
Cheese
208eaf3a01
cosmetics recharge slowdown
2015-12-01 11:38:52 +11:00
Cheese
1a1fa684e4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-01 10:44:39 +11:00
Cheese
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
Christopher Jozsa
26b374f4f0
Merge pull request #84 in MIN/mineplex from virizion_utils to master
...
* commit '9d380a0b317b321831688eb7b9b3f4eb21281ad6':
Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values.
2015-11-30 17:34:24 -06:00
Virizion
9d380a0b31
Merge remote-tracking branch 'remotes/origin/master' into virizion_utils
2015-11-30 17:47:08 -05:00
Virizion
666b9963e4
Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values.
2015-11-30 17:42:48 -05:00
NewGarbo
18504e48f7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 21:00:42 +00:00
NewGarbo
1a851679c4
made it so players cannot see chat whilst in tutorial
2015-11-30 20:40:30 +00:00
Jonathan Williams
482ec8a120
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 14:26:37 -06:00
Jonathan Williams
513810caaa
Fixed memory leak in MarkedForDeath
2015-11-30 14:26:25 -06:00
