Cheese
fa6418769b
YT name change
2015-12-06 21:26:02 +11:00
Cheese
e01d30b920
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-04 13:19:07 +11:00
Cheese
ef2511434d
tuber arnk
2015-12-04 13:18:23 +11:00
Christopher Jozsa
8717f962e6
Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
Added missing MountData and SingleEntityMountData files.
Mount bug fix.
Added method to edit NoAI field on entities.
Implemented new mount data system replacing instead of entities as data.
We only need to add the "Go Back" page once...
TitanMount fixes
2015-12-03 17:15:21 -06:00
Christopher Jozsa
fc0cae8e0f
Merge pull request #85 in MIN/mineplex from virizion_utils to master
...
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
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 18:53:30 -06:00
NewGarbo
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
Virizion
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
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
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
xGamingDudex
6120c8246b
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-29 19:11:24 +01:00
xGamingDudex
2c2370f8a0
Added method to edit NoAI field on entities.
2015-11-29 19:08:26 +01:00
Shaun Bennett
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
NewGarbo
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
NewGarbo
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
Cheese
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
Cheese
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
Cheese
0871663498
titan stuff
...
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
Shaun Bennett
1a87d85174
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-27 23:13:43 -05:00
xGamingDudex
24f8a98545
Added titan particle trail.
2015-11-28 02:22:41 +01:00
libraryaddict
5f8f643d95
What snake mount code I did
2015-11-28 05:26:43 +13:00
NewGarbo
3be2986cea
sethome command now places bed even if theres grass
2015-11-27 13:26:12 +00:00
Cheese
4e2f48b37e
Merge branch 'master' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
Cheese
98d988584d
titan cosmetics
2015-11-27 13:35:25 +11:00
NewGarbo
0aaee24600
fixed gear UI display stuff incorrectly
2015-11-26 21:06:33 +00:00
NewGarbo
56d5c10481
oops util ent new method didn't commit in last commit
2015-11-26 07:29:59 +00:00
Cheese
193c5fe487
fixed static
2015-11-26 15:26:57 +11:00
Cheese
059a9a32cd
fixed method
2015-11-26 14:51:45 +11:00
Cheese
1a5dbc073d
recursive block find method
2015-11-26 14:47:01 +11:00
NewGarbo
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
Shaun Bennett
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
NewGarbo
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
NewGarbo
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
xGamingDudex
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
xGamingDudex
3b89d65a09
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
2015-11-25 15:59:18 +01:00
NewGarbo
459e1beeff
clans buggy fixers
2015-11-24 22:18:48 +00:00
Cheese
4d128d9c7a
fixed some skills and wierd hitbox error
2015-11-21 10:29:48 +11:00
AlexTheCoder
f51358552a
-B
2015-11-20 05:57:29 -05:00
NewGarbo
0a667afeb1
finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching
2015-11-18 22:27:01 +00:00
NewGarbo
eded09b1a9
fixed yet another bug with beds... argh it seems to be working fine now.
2015-11-18 21:02:39 +00:00
NewGarbo
6f3693f804
more bug fixes
2015-11-18 19:32:20 +00:00
NewGarbo
924504ac9f
fixed clans home NPE. also added GRASS to UtilItem's item property system.
2015-11-18 19:03:44 +00:00
NewGarbo
9eaffc8acf
Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on.
2015-11-18 12:17:00 +00:00
Shaun Bennett
4183f0ce07
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
2015-11-17 18:05:17 -05:00
Shaun Bennett
f6cfc36e9f
War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard
2015-11-17 17:59:35 -05:00
NewGarbo
31906b025f
Clans Home switched over to using physical beds.
...
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
2015-11-17 22:24:19 +00:00
Shaun Bennett
07f92d2e6e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
2015-11-16 14:39:47 -05:00
NewGarbo
fff248ad86
king of the hill gold drop fix
2015-11-15 20:37:37 +00:00
NewGarbo
5209cf3d38
fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself.
2015-11-15 20:04:44 +00:00
