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
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
Sarah
e2cfcef55b
RunTasksSync Flag.
2015-11-30 16:58:41 +01:00
NewGarbo
0862cfce72
fixed doors getting placed in spawn and shops
2015-11-30 07:26:02 +00:00
NewGarbo
261d6dd030
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 07:08:34 +00:00
NewGarbo
f528531b82
removed some testing stuff
2015-11-30 07:06:36 +00:00
Shaun Bennett
34c4bade06
Merge remote-tracking branch 'origin/master'
2015-11-29 19:30:51 -05:00
Cheese
02bc7ffab6
map changes
2015-11-30 11:17:23 +11:00
Shaun Bennett
981eead816
Merge remote-tracking branch 'origin/master'
2015-11-29 19:05:56 -05:00
Cheese
0f79b5814f
more color f ixes
2015-11-30 10:52:44 +11:00
Shaun Bennett
25bb913c4f
Merge remote-tracking branch 'origin/master'
2015-11-29 18:41:35 -05:00
Cheese
2ac21b1434
better colors
2015-11-30 10:40:57 +11:00
Shaun Bennett
4a9d53de50
Merge remote-tracking branch 'origin/master'
2015-11-29 18:33:43 -05:00
Cheese
18b603ec2f
map color changes
2015-11-30 10:33:08 +11:00
Shaun Bennett
f7f7d5fdef
Merge remote-tracking branch 'origin/master'
2015-11-29 18:26:40 -05:00
Cheese
e27808a011
map!
2015-11-30 10:26:07 +11:00
Shaun Bennett
125d9988c2
Merge remote-tracking branch 'origin/master'
2015-11-29 18:21:02 -05:00
Cheese
cd6ecc1e67
pt!
2015-11-30 10:20:27 +11:00
Shaun Bennett
06706da4cf
Merge remote-tracking branch 'origin/master'
2015-11-29 18:16:13 -05:00
Cheese
a886088f48
more changes
2015-11-30 10:15:50 +11:00
Shaun Bennett
2b22639d8a
Merge remote-tracking branch 'origin/master'
2015-11-29 18:03:46 -05:00
Cheese
af77a2ddeb
fix
2015-11-30 10:03:27 +11:00
Shaun Bennett
1c71efbff7
Merge remote-tracking branch 'origin/master'
2015-11-29 17:59:39 -05:00
Shaun Bennett
58d7e8562b
update clans version for next release
2015-11-29 17:58:29 -05:00
Cheese
af61b62a47
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 09:58:06 +11:00
Cheese
7e3cab9c87
map test
2015-11-30 09:57:47 +11:00
NewGarbo
8026ad891d
fixed king of the hill
2015-11-29 21:09:18 +00:00
Sarah
dc68375ec8
TimeBetweenPhase Flag.
2015-11-29 21:48:39 +01:00
NewGarbo
be727e6e26
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
2015-11-29 19:46:08 +00:00
xGamingDudex
6120c8246b
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-29 19:11:24 +01:00
xGamingDudex
d1d58919f4
Mount bug fix.
...
Mount was put in map before removed, resulting in new mount being half
disabled.
2015-11-29 19:09:55 +01:00
xGamingDudex
2c2370f8a0
Added method to edit NoAI field on entities.
2015-11-29 19:08:26 +01:00
xGamingDudex
509835ea64
Implemented new mount data system replacing instead of entities as data.
...
+ Removed some unnecessary code
+ Made StackManager use new mount system
This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
2015-11-29 19:08:00 +01:00
xGamingDudex
327bf8d09b
We only need to add the "Go Back" page once...
2015-11-29 18:32:24 +01:00
fooify
61df87b446
Merge remote-tracking branch 'origin/master' into foo
2015-11-29 06:37:30 -08:00
Jonathan Williams
7bdf5451d4
Upped map scan performance.
2015-11-29 02:49:12 -06: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
Jonathan Williams
782026556e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-29 02:24:32 -06:00
Jonathan Williams
e9da258333
Lowered scan rate significantly for ItemMapManager.
2015-11-29 02:24:17 -06:00
Shaun Bennett
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
