e9fd661311
disabled koth
2015-12-02 18:25:53 +00:00
8fea5afdce
fixed message on tick (might be cause of laggg)
2015-12-02 06:56:58 +00:00
92c1abf221
a few last touches
2015-12-02 06:04:53 +00:00
8db5ffe5c7
forcejoin command for ADMIN+ and fixed auto tree replanting.
2015-12-02 05:54:00 +00:00
3a4e453ac3
made it so that you can only use /reset in safe zones
2015-12-02 05:18:04 +00:00
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
bf92af647a
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 00:00:32 -05:00
b8e2086928
changes to tutorial
2015-12-02 00:19:48 +00:00
ba27d94158
fixed skiptutorial message not displaying
2015-12-01 23:23:11 +00:00
cffb6bd62f
bunch o' changes
2015-12-01 23:01:41 +00:00
a7d6026c07
made skip tutorial messages be seen whilst in tutorial
2015-12-01 22:33:47 +00:00
69cb395f5a
made entire clan know about disband
2015-12-01 22:30:05 +00:00
35ae89ab1f
fixed players from being able to eat their carrot in the making money task
2015-12-01 19:37:53 +00:00
ea099d7a82
fixed some annoying bugs and fixed certain messages not showing in tutorial
2015-12-01 18:41:33 +00:00
fbf9c8eb0c
made certain messages visible in tutorial that are actually required to be seen
2015-12-01 13:37:34 +00:00
f536bf23e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-01 12:06:25 +00:00
d32e6fdb96
Got rid of deployed tasks. using different system now. (untested)
2015-12-01 11:28:14 +00:00
633697dc7a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 23:49:32 -06:00
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
51023a7630
cosmetic cooldown fix
2015-12-01 15:38:54 +11:00
208eaf3a01
cosmetics recharge slowdown
2015-12-01 11:38:52 +11:00
c98b427fde
Added missing MountData and SingleEntityMountData files.
...
For some reason, git decided that it was a good idea to remove these two
files from the index...
2015-12-01 00:46:20 +01:00
1a1fa684e4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-01 10:44:39 +11:00
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
9d380a0b31
Merge remote-tracking branch 'remotes/origin/master' into virizion_utils
2015-11-30 17:47:08 -05:00
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
18504e48f7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 21:00:42 +00:00
1a851679c4
made it so players cannot see chat whilst in tutorial
2015-11-30 20:40:30 +00:00
482ec8a120
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 14:26:37 -06:00
513810caaa
Fixed memory leak in MarkedForDeath
2015-11-30 14:26:25 -06:00
6eb44ed87b
whoops.. this isn't php hehe
2015-11-30 19:11:18 +00:00
813e7ee789
made it so that no messages are shown when in tutorial
2015-11-30 19:08:16 +00:00
0862cfce72
fixed doors getting placed in spawn and shops
2015-11-30 07:26:02 +00:00
261d6dd030
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 07:08:34 +00:00
f528531b82
removed some testing stuff
2015-11-30 07:06:36 +00:00
34c4bade06
Merge remote-tracking branch 'origin/master'
2015-11-29 19:30:51 -05:00
02bc7ffab6
map changes
2015-11-30 11:17:23 +11:00
981eead816
Merge remote-tracking branch 'origin/master'
2015-11-29 19:05:56 -05:00
0f79b5814f
more color f ixes
2015-11-30 10:52:44 +11:00
25bb913c4f
Merge remote-tracking branch 'origin/master'
2015-11-29 18:41:35 -05:00
2ac21b1434
better colors
2015-11-30 10:40:57 +11:00
4a9d53de50
Merge remote-tracking branch 'origin/master'
2015-11-29 18:33:43 -05:00
18b603ec2f
map color changes
2015-11-30 10:33:08 +11:00
f7f7d5fdef
Merge remote-tracking branch 'origin/master'
2015-11-29 18:26:40 -05:00
e27808a011
map!
2015-11-30 10:26:07 +11:00
125d9988c2
Merge remote-tracking branch 'origin/master'
2015-11-29 18:21:02 -05:00
cd6ecc1e67
pt!
2015-11-30 10:20:27 +11:00
06706da4cf
Merge remote-tracking branch 'origin/master'
2015-11-29 18:16:13 -05:00
a886088f48
more changes
2015-11-30 10:15:50 +11:00
2b22639d8a
Merge remote-tracking branch 'origin/master'
2015-11-29 18:03:46 -05:00
af77a2ddeb
fix
2015-11-30 10:03:27 +11:00
1c71efbff7
Merge remote-tracking branch 'origin/master'
2015-11-29 17:59:39 -05:00
58d7e8562b
update clans version for next release
2015-11-29 17:58:29 -05:00
af61b62a47
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 09:58:06 +11:00
7e3cab9c87
map test
2015-11-30 09:57:47 +11:00
8026ad891d
fixed king of the hill
2015-11-29 21:09:18 +00:00
be727e6e26
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
2015-11-29 19:46:08 +00:00
6120c8246b
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-29 19:11:24 +01:00
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
2c2370f8a0
Added method to edit NoAI field on entities.
2015-11-29 19:08:26 +01:00
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
327bf8d09b
We only need to add the "Go Back" page once...
2015-11-29 18:32:24 +01:00
7bdf5451d4
Upped map scan performance.
2015-11-29 02:49:12 -06:00
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
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
782026556e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-29 02:24:32 -06:00
e9da258333
Lowered scan rate significantly for ItemMapManager.
2015-11-29 02:24:17 -06:00
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
0d5fa70632
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 23:05:32 -06:00
5acf6b19a4
Fixed bed checking interval.
...
Added timing logging to map rendering.
2015-11-28 23:05:22 -06:00
7c947ad97b
Merge master
2015-11-28 23:55:00 -05:00
c6ff01b92d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 22:33:03 -06:00
118af20f44
Updated EnjinTranslator.
2015-11-28 22:32:50 -06:00
b88a842f1c
stuff
2015-11-29 03:22:52 +00:00
c870d99e0e
teleport stuff
2015-11-29 02:55:45 +00:00
a9afe1f068
added self clan create/delete messages
2015-11-29 02:54:40 +00:00
84303234fd
fixed task 2
2015-11-29 02:48:03 +00:00
392ab601c2
tutorial tasks reset
2015-11-29 02:43:12 +00:00
d7658f3838
fixed stuck manager taking 0 seconds
2015-11-29 02:39:09 +00:00
dc5aec33b4
tutorial ending message
2015-11-29 02:37:20 +00:00
8dca384d35
force join command
2015-11-29 02:31:14 +00:00
9ff9724fc8
tutorial revamp 2.0
2015-11-29 02:10:39 +00:00
5cefe27257
cosmetic fixes
2015-11-29 11:40:19 +11:00
e1be0b1dbd
dupe fix
2015-11-28 23:34:41 +00:00
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
ace4548b1e
don't cull an entity if a player is nearby
2015-11-28 20:14:48 +00:00
afbccba36f
added force join command for ADMIN+
2015-11-28 19:56:47 +00:00
75ef42d8c9
fixed the clan claim box check
2015-11-28 19:37:03 +00:00
dc0da3987b
TitanMount fixes
...
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
2015-11-28 17:22:17 +01:00
51227ae4f3
fixed leak
2015-11-29 01:25:15 +11:00
f5384a1382
staff mode
2015-11-28 09:31:18 +00:00
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
0dceca5cfc
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 09:04:15 +00:00
a0ae500876
tutorial revamp [clans]
2015-11-28 09:03:58 +00:00
b6f6d4458e
Fixed StaffServer.
2015-11-28 01:43:00 -06:00
700cf51206
titan stuff almost done
2015-11-28 16:35:11 +11:00
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
8af545af80
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
2015-11-28 15:59:26 +11:00
0871663498
titan stuff
...
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
bcbc5244c6
Add Clans.core to hub build (IntelliJ)
2015-11-27 23:14:54 -05:00
NewGarbo
Virizion
Jonathan Williams
Cheese
xGamingDudex
Shaun Bennett