1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
000b1f85b7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-24 07:41:55 +13:00
67bdc6832f
Tentative beginnings for clans resource packs
2015-12-24 07:40:49 +13:00
369687b5dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
1840572c49
Lots of changes, specifics:
...
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
2015-12-18 11:13:38 +00:00
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05:00
4bf7e15055
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
2015-12-18 01:05:02 +00:00
b4c3ce9fba
a couple more prettificatons to pvp timer messages.
2015-12-16 23:19:04 +00:00
eb9ba92fb1
one more quick message change/fix
2015-12-16 22:53:24 +00:00
2ee1ccbcf9
qa changes to pvp safety
2015-12-16 22:48:55 +00:00
d619a9644b
few changes to pvp timer, and fixed bugs etc
2015-12-16 18:25:30 +00:00
7ac1fd86b4
made pvp timer players immune to skills
2015-12-15 21:12:49 +00:00
baef84f4d9
fixed pvp timer subtitles bugged out
2015-12-15 20:09:54 +00:00
607c164753
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
2015-12-15 13:55:01 -05:00
6a346790f7
disable tutorial
2015-12-15 12:00:56 +00:00
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
6c2b40d63a
Cannon work
2015-12-13 15:40:32 -05:00
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
667f076202
fixed unsafe timer
2015-12-09 10:46:05 +00:00
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
a9c7f088f3
made use ability teleport player back to where they should be
2015-12-06 19:10:18 +00:00
11e1e53a36
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-05 21:36:19 -05:00
d5a9a92913
Forgot to push these changes last update!
2015-12-05 21:36:07 -05:00
5d59b1a015
fixed tnt blowing up in claims when offline
2015-12-04 18:32:46 +00:00
bca65116ab
fixed task not getting cleanup up after /skiptutorial
2015-12-04 18:23:23 +00:00
f57f4ed0aa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-04 12:10:10 -05:00
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
bb382a969c
Fix heavy attribute, disable claim visualizer
2015-12-04 08:02:38 -05:00
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
2435ebba13
Disable subtasks for now
2015-12-04 05:16:14 -05:00
5c575b41fc
Clans alpha 0.17
2015-12-04 05:15:28 -05:00
39daf969fd
clan claim visualizer
2015-12-03 22:29:36 +00:00
584a02ae3e
fixed infinite claims
2015-12-03 10:30:06 +00:00
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
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
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
1a851679c4
made it so players cannot see chat whilst in tutorial
2015-11-30 20:40:30 +00: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
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
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
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
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
a0ae500876
tutorial revamp [clans]
2015-11-28 09:03:58 +00:00
260002c9cf
final changes
2015-11-27 21:02:20 +00:00
9e84029e04
fixes
2015-11-27 20:50:00 +00:00
b36642b22b
remove trust command
2015-11-27 20:27:33 +00:00
d5502500b6
fixes & changes
2015-11-27 20:24:07 +00:00
6ac871f04c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 19:43:48 +00:00
fe085c1571
loaaads of stuff
2015-11-27 19:42:15 +00:00
f06ceab277
Adjustments
2015-11-27 09:33:31 -05:00
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
4d23b2a39f
fixed (I BELIEVE) chests not opening in own territory
2015-11-27 14:24:02 +00:00
def46c715e
fixer
2015-11-28 00:52:54 +11:00
627fbc7df2
add info into chat if a player is in creative
2015-11-27 13:50:18 +00:00
b45eb53dff
remove old items
2015-11-28 00:43:01 +11:00
ad0c161f16
set players time to day during tutorial
2015-11-27 13:28:37 +00:00
691105b2cb
force place bed on first claim
2015-11-27 13:23:37 +00:00
fdb493d95d
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 00:23:32 +11:00
ab3d2ba098
updated tutorials.
...
added worldmanager to cull entities.
2015-11-28 00:23:18 +11:00
4423baca96
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 13:15:46 +00:00
f0669cb610
fixed undead camp item naming being italic
2015-11-27 13:15:26 +00:00
67b9755f0d
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 22:27:33 +11:00
53da9c97d0
item frame cancel!
2015-11-27 22:27:20 +11:00
b996dc20ca
Enable tutorial, fix stuck command
2015-11-27 06:26:32 -05:00
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
3e37a63aa8
fixed chome teleport height
2015-11-27 20:59:23 +11:00
9ce4440679
extra cmds
2015-11-27 20:36:00 +11:00
6428d28275
travel hub bed fix
2015-11-27 20:31:19 +11:00
797dcf8d8e
fxied song again T_T
2015-11-27 20:01:48 +11:00
c501a42094
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 19:29:33 +11:00
5d40a57df8
sound fix
2015-11-27 19:29:17 +11:00
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
e25df8739d
EAST 2 WEST
2015-11-27 18:46:15 +11:00
4085c998cd
MUSIC 4 LIFE
2015-11-27 18:44:33 +11:00
408c2cf72a
im an idiot
2015-11-27 01:40:28 -05:00
bdbb75e196
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:35:16 -05:00
34368722a9
Fix gold manager again
2015-11-27 01:35:10 -05:00
7efcf5426d
no hunger depletion in safe zones
2015-11-27 06:34:29 +00:00
c96b0c529a
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 06:26:23 +00:00
42d39a40e9
WIND
2015-11-27 06:25:58 +00:00
94090c9434
adjust gold drops
2015-11-27 01:24:03 -05:00
e211fe182d
Adjust gem conversion rate
2015-11-27 01:06:53 -05:00
c33eea28a2
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 06:05:39 +00:00
a9669ade31
Immolate fix hopefully
2015-11-27 06:05:22 +00:00
0aeca96746
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:05:16 -05:00
32c17cad7e
Shop price changes
2015-11-27 01:04:51 -05:00
9082ace3f3
wind blade fall damage
2015-11-27 05:46:37 +00:00
20a9ed5a6e
staff not being able to join fix
2015-11-27 05:13:47 +00:00
f81d1d390a
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 05:04:46 +00:00
b22c766c94
more clans modificatons
2015-11-27 05:04:24 +00:00
libraryaddict
NewGarbo
Shaun Bennett
Shaun Bennett
Jonathan Williams
Cheese