JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,709 Commits 1 Branch 0 Tags 481 MiB
7f9e5c4ec9
Commit Graph

5506 Commits

Author SHA1 Message Date
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
fooify
48ae23ebff changed reference to premium ranks 2015-11-30 19:58:41 -08:00
fooify
06ef964000 removed important debug thing 2015-11-30 19:33:03 -08:00
fooify
ed96c8e3b3 fixed ssm enderman always facing south on teleport 2015-11-30 19:27:34 -08:00
Cheese
208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
xGamingDudex
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
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
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
Jonathan Williams
0d5fa70632 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-28 23:05:32 -06:00
Jonathan Williams
5acf6b19a4 Fixed bed checking interval. 
Added timing logging to map rendering.
 2015-11-28 23:05:22 -06:00
Shaun Bennett
7c947ad97b Merge master 2015-11-28 23:55:00 -05:00
Jonathan Williams
c6ff01b92d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-28 22:33:03 -06:00
Jonathan Williams
118af20f44 Updated EnjinTranslator. 2015-11-28 22:32:50 -06:00
NewGarbo
b88a842f1c stuff 2015-11-29 03:22:52 +00:00
NewGarbo
c870d99e0e teleport stuff 2015-11-29 02:55:45 +00:00
NewGarbo
a9afe1f068 added self clan create/delete messages 2015-11-29 02:54:40 +00:00
NewGarbo
84303234fd fixed task 2 2015-11-29 02:48:03 +00:00
NewGarbo
392ab601c2 tutorial tasks reset 2015-11-29 02:43:12 +00:00
NewGarbo
d7658f3838 fixed stuck manager taking 0 seconds 2015-11-29 02:39:09 +00:00
NewGarbo
dc5aec33b4 tutorial ending message 2015-11-29 02:37:20 +00:00
NewGarbo
8dca384d35 force join command 2015-11-29 02:31:14 +00:00
NewGarbo
9ff9724fc8 tutorial revamp 2.0 2015-11-29 02:10:39 +00:00
Cheese
5cefe27257 cosmetic fixes 2015-11-29 11:40:19 +11:00
NewGarbo
e1be0b1dbd dupe fix 2015-11-28 23:34:41 +00:00
Sarah
66fd85af1f Adding Phase Event. 2015-11-28 23:32:09 +01: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
ace4548b1e don't cull an entity if a player is nearby 2015-11-28 20:14:48 +00:00
NewGarbo
afbccba36f added force join command for ADMIN+ 2015-11-28 19:56:47 +00:00
NewGarbo
75ef42d8c9 fixed the clan claim box check 2015-11-28 19:37:03 +00:00
fooify
8cdae7ce1a Merge remote-tracking branch 'origin/master' into foo 2015-11-28 09:33:47 -08:00
fooify
0dff0ffe1d fixed bacon blast exloding blocks 
fixed sg compass pointing to teammates
 2015-11-28 09:32:54 -08:00
xGamingDudex
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
Cheese
51227ae4f3 fixed leak 2015-11-29 01:25:15 +11:00
NewGarbo
f5384a1382 staff mode 2015-11-28 09:31:18 +00:00
NewGarbo
d8ae035f84 creative scoreboard team. and fixed npe in tutorials 2015-11-28 09:20:42 +00:00
NewGarbo
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
NewGarbo
a0ae500876 tutorial revamp [clans] 2015-11-28 09:03:58 +00:00
Jonathan Williams
b6f6d4458e Fixed StaffServer. 2015-11-28 01:43:00 -06:00
Cheese
700cf51206 titan stuff almost done 2015-11-28 16:35:11 +11: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
bcbc5244c6 Add Clans.core to hub build (IntelliJ) 2015-11-27 23:14:54 -05: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
Sarah
ad54d28b0d fixing teleportation issues. 2015-11-27 22:29:29 +01:00
NewGarbo
260002c9cf final changes 2015-11-27 21:02:20 +00:00
NewGarbo
9e84029e04 fixes 2015-11-27 20:50:00 +00:00
NewGarbo
b36642b22b remove trust command 2015-11-27 20:27:33 +00:00
NewGarbo
d5502500b6 fixes & changes 2015-11-27 20:24:07 +00:00
Sarah
fd0c5cf273 Adding some more flags. 2015-11-27 20:47:57 +01:00
NewGarbo
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
NewGarbo
fe085c1571 loaaads of stuff 2015-11-27 19:42:15 +00:00
libraryaddict
636dcdf9f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
 2015-11-28 05:28:04 +13:00
libraryaddict
5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
Shaun Bennett
f06ceab277 Adjustments 2015-11-27 09:33:31 -05:00
NewGarbo
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
NewGarbo
4d23b2a39f fixed (I BELIEVE) chests not opening in own territory 2015-11-27 14:24:02 +00:00
Cheese
def46c715e fixer 2015-11-28 00:52:54 +11:00
NewGarbo
627fbc7df2 add info into chat if a player is in creative 2015-11-27 13:50:18 +00:00
Cheese
b45eb53dff remove old items 2015-11-28 00:43:01 +11:00
NewGarbo
ad0c161f16 set players time to day during tutorial 2015-11-27 13:28:37 +00:00
NewGarbo
3be2986cea sethome command now places bed even if theres grass 2015-11-27 13:26:12 +00:00
NewGarbo
691105b2cb force place bed on first claim 2015-11-27 13:23:37 +00:00
Cheese
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
Cheese
ab3d2ba098 updated tutorials. 
added worldmanager to cull entities.
 2015-11-28 00:23:18 +11:00
NewGarbo
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
NewGarbo
f0669cb610 fixed undead camp item naming being italic 2015-11-27 13:15:26 +00:00
Cheese
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
Cheese
53da9c97d0 item frame cancel! 2015-11-27 22:27:20 +11:00
Shaun Bennett
b996dc20ca Enable tutorial, fix stuck command 2015-11-27 06:26:32 -05:00
Shaun Bennett
a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Cheese
ec0e2d2d64 fixed colors 2015-11-27 21:09:25 +11:00
Cheese
3e37a63aa8 fixed chome teleport height 2015-11-27 20:59:23 +11:00
Cheese
dda0e827e1 FGIXEXFSD 2015-11-27 20:46:33 +11:00
Cheese
9ce4440679 extra cmds 2015-11-27 20:36:00 +11:00
Cheese
6428d28275 travel hub bed fix 2015-11-27 20:31:19 +11:00
Cheese
797dcf8d8e fxied song again T_T 2015-11-27 20:01:48 +11:00
Cheese
936e61de57 gui changes :) 2015-11-27 19:42:04 +11:00
Cheese
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
Cheese
5d40a57df8 sound fix 2015-11-27 19:29:17 +11:00
Shaun Bennett
0b0710458f Hub updates/try to fix chiss stuff 2015-11-27 03:22:17 -05: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
f55b6761a8 disabled titan gadgets! 2015-11-27 19:14:35 +11:00
Cheese
e25df8739d EAST 2 WEST 2015-11-27 18:46:15 +11:00
Cheese
4085c998cd MUSIC 4 LIFE 2015-11-27 18:44:33 +11:00
Shaun Bennett
408c2cf72a im an idiot 2015-11-27 01:40:28 -05:00
Shaun Bennett
bdbb75e196 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-27 01:35:16 -05:00
Shaun Bennett
34368722a9 Fix gold manager again 2015-11-27 01:35:10 -05:00
NewGarbo
7efcf5426d no hunger depletion in safe zones 2015-11-27 06:34:29 +00:00
NewGarbo
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
NewGarbo
42d39a40e9 WIND 2015-11-27 06:25:58 +00:00
Shaun Bennett
94090c9434 adjust gold drops 2015-11-27 01:24:03 -05:00
Shaun Bennett
e211fe182d Adjust gem conversion rate 2015-11-27 01:06:53 -05:00
NewGarbo
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
NewGarbo
a9669ade31 Immolate fix hopefully 2015-11-27 06:05:22 +00:00
Shaun Bennett
0aeca96746 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-27 01:05:16 -05:00
Shaun Bennett
32c17cad7e Shop price changes 2015-11-27 01:04:51 -05:00
Cheese
77be81c216 pet changes 2015-11-27 16:50:22 +11:00
Cheese
2b047cdde8 more titan stuff 2015-11-27 16:46:48 +11:00
NewGarbo
9082ace3f3 wind blade fall damage 2015-11-27 05:46:37 +00:00
NewGarbo
20a9ed5a6e staff not being able to join fix 2015-11-27 05:13:47 +00:00
NewGarbo
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
NewGarbo
b22c766c94 more clans modificatons 2015-11-27 05:04:24 +00:00
Cheese
05e7183b65 titan stuff update 2015-11-27 15:55:00 +11:00
Shaun Bennett
a46bed53fa Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 23:42:22 -05:00
Shaun Bennett
31f083387d Use Castle icon on travel page 2015-11-26 23:42:16 -05:00
NewGarbo
174825776b meow clams 2015-11-27 04:39:04 +00:00
NewGarbo
9dcc048953 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:23:14 +00:00
NewGarbo
6119500b68 changes 2015-11-27 04:23:02 +00:00
Shaun Bennett
faaa1fcf0b Use castle clan icon for /c <clan> 2015-11-26 23:15:14 -05:00
NewGarbo
5744178286 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:06:02 +00:00
NewGarbo
dbda29e3f3 magnetic maul fixes 2015-11-27 04:05:47 +00:00
NewGarbo
73f4450fa3 clans fixes 2015-11-27 04:04:29 +00:00
Shaun Bennett
ef511f1704 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 22:38:03 -05:00
Shaun Bennett
6da10950da Update clan icons, fix client class 2015-11-26 22:37:54 -05:00
NewGarbo
0274bf2847 loads of changes. 2015-11-27 03:28:19 +00:00
libraryaddict
3c98243201 Some more guardian stuff 2015-11-27 15:56:56 +13:00
libraryaddict
0a4416381b Fix guardian 2015-11-27 15:55:02 +13:00
Cheese
98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
NewGarbo
e849484670 bunch of changes and fixes and bugs and stuff and things 2015-11-26 23:59:47 +00:00
NewGarbo
055702b36e changes and fixes and woo 2015-11-26 23:08:33 +00:00
NewGarbo
56d4b34969 fixed formatting on death notices. 
Made world event middle texts longer lasting.
Fixed logout NPC timer
 2015-11-26 21:57:26 +00:00
NewGarbo
5393d1d18c Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 21:16:21 +00:00
Shaun Bennett
6e416b1059 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
 2015-11-26 16:12:54 -05:00
Shaun Bennett
27e214a643 Region fix 2015-11-26 16:12:29 -05:00
NewGarbo
dd33d9587d made power recharge a tad faster with Wind Blade 2015-11-26 21:12:09 +00:00
NewGarbo
0aaee24600 fixed gear UI display stuff incorrectly 2015-11-26 21:06:33 +00:00
NewGarbo
bb3ea0115d fixed classes not loading 2015-11-26 20:41:42 +00:00
NewGarbo
67a28a94fb bunch of fixes 2015-11-26 20:32:01 +00:00
Sarah
c74732af39 One more fix. 2015-11-26 16:37:18 +01:00
Sarah
21f859f579 fixing 2 seconds delay. 2015-11-26 16:26:49 +01:00
Sarah
a653f053a5 Adding 2 Seconds delay. 2015-11-26 16:12:13 +01:00
Sarah
eddbde5ebd Changing length formula. 2015-11-26 16:06:15 +01:00
NewGarbo
2bce722539 some code polishing. fixed some mispositioning with Spawn holograms. 2015-11-26 13:29:40 +00:00
NewGarbo
e5fa59b8da Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 13:17:28 +00:00
NewGarbo
009ddaaee1 stop players in tutorial from receiving/sending chat. 2015-11-26 13:16:50 +00:00
NewGarbo
bbfd319bcd Spawn holograms 2015-11-26 13:14:10 +00:00
NewGarbo
1ce2a362c6 disallow item frames being rotated in Spawn 2015-11-26 12:34:12 +00:00
NewGarbo
be19c17fee fixed gem -> gold conversion rate 2015-11-26 12:33:29 +00:00
NewGarbo
9aaad0b4a1 fixed formatting in /spawn command 2015-11-26 12:31:55 +00:00
Shaun Bennett
bdc08676d9 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
 2015-11-26 03:34:33 -05:00
Shaun Bennett
d4f3786b1c Fixes 2015-11-26 03:31:03 -05:00
NewGarbo
94a0f3244d corrected typo in WindBlade.java 2015-11-26 07:53:37 +00:00
NewGarbo
af0df835b8 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/items/legendaries/WindBlade.java
 2015-11-26 07:52:35 +00:00
NewGarbo
97e903f403 updated regions 2015-11-26 07:51:10 +00:00
Shaun Bennett
75ff5bb3da Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 02:46:56 -05:00
NewGarbo
56d5c10481 oops util ent new method didn't commit in last commit 2015-11-26 07:29:59 +00:00
NewGarbo
c0cfdf9785 fixed windblade not recharging whilst jumping 2015-11-26 07:29:39 +00:00
NewGarbo
e80c1097b5 corrected regions 2015-11-26 07:08:30 +00:00
NewGarbo
0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
Shaun Bennett
6de7b8a73e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 01:46:43 -05:00
NewGarbo
972a2d151a simplified combat log npc title 2015-11-26 06:21:01 +00:00
NewGarbo
f92849f796 that doesn't do what i thought it did 2015-11-26 05:32:59 +00:00
NewGarbo
1e4b6b4d0f fixed formatting error in clan tip 2015-11-26 05:30:13 +00:00
NewGarbo
7da8b8e3bf fix players hurting each other in safe zones 2015-11-26 05:29:35 +00:00
NewGarbo
48ebfc219d removed travel npcs from shops 2015-11-26 05:24:33 +00:00
Shaun Bennett
389956240b Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 00:20:41 -05:00
NewGarbo
76d009e0de Unstuck (Spawn) command 2015-11-26 05:18:18 +00:00
NewGarbo
33cdd5400d fixed some coloring issues 2015-11-26 04:32:41 +00:00
Cheese
193c5fe487 fixed static 2015-11-26 15:26:57 +11:00
Shaun Bennett
8f14c8beae Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
 2015-11-25 23:26:29 -05:00
Shaun Bennett
7a663b4f7b Fix legendaries 2015-11-25 23:24:07 -05:00
NewGarbo
8bd1f4b3c8 reduced hyper axe damage. OP as heck 2015-11-26 04:21:30 +00:00
NewGarbo
abcee009dd stuff 2015-11-26 04:07:33 +00:00
Cheese
059a9a32cd fixed method 2015-11-26 14:51:45 +11:00
Cheese
83a7b398bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-26 14:47:24 +11:00
Cheese
1a5dbc073d recursive block find method 2015-11-26 14:47:01 +11:00
NewGarbo
670afc17ef clans chat is being weird 2015-11-26 03:26:15 +00:00
NewGarbo
5230b25dfd fixed suicide command (?) 2015-11-26 03:24:48 +00:00
NewGarbo
4f275d79fa fixed staff tags only displaying if player is in clan 2015-11-26 03:19:40 +00:00
NewGarbo
5fb58b1dad added suicide command 2015-11-26 03:17:05 +00:00
NewGarbo
8a64a2f4ce fixed world events spawning floating on grass and other boundless blocks 2015-11-26 03:06:27 +00:00
NewGarbo
b43cf0b28a got rid of enchanted effect on rare items 2015-11-26 03:00:59 +00:00
libraryaddict
55ff04ca93 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-26 15:49:54 +13:00
libraryaddict
3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
NewGarbo
7e23f896ca changes 2015-11-26 02:49:01 +00:00
Cheese
55f5f95869 added no ammo display 2015-11-26 13:05:27 +11:00
Cheese
65a1441e1f -Fixed smoke being removed when bomb was planted in it 
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
 2015-11-26 12:56:26 +11:00
NewGarbo
a19ade0739 rain rain go away 2015-11-26 00:53:01 +00:00
NewGarbo
11deec75dd fixed illusion 2015-11-26 00:44:13 +00:00
Shaun Bennett
c150ea6175 Potatoes and Tornadoes 2015-11-25 19:08:13 -05:00
Sarah
809faf3098 changing teleport mechanic. 2015-11-26 00:14:15 +01:00
Shaun Bennett
cc75bafb4c Bugs and thugs 2015-11-25 16:45:04 -05: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
c5211e0368 buuugs 2015-11-25 17:40:12 +00: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
Cheese
360f3db2ed fixed grenade vertical rebound bug 2015-11-25 17:48:32 +11:00
Cheese
8ceb6ccfca minestrike update! 2015-11-25 17:41:00 +11:00
NewGarbo
7e9dc7968e gear gui fixes and legendaries changes 2015-11-25 01:32:05 +00:00
NewGarbo
bbdbb209c5 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-25 00:55:37 +00:00
NewGarbo
3a6dab7224 stuff 2015-11-25 00:55:11 +00:00
NewGarbo
3cb22c8cb7 uuid bug fixed finally! 2015-11-25 00:47:35 +00:00
libraryaddict
ecf42803f9 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-11-25 13:42:31 +13:00
libraryaddict
ca81265b9e Readded PacketHandler debug message 2015-11-25 13:42:11 +13:00
NewGarbo
aa52c1be27 custom item stuff 2015-11-25 00:14:34 +00:00
NewGarbo
6220ce14fe Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-24 23:04:24 +00:00
NewGarbo
98edd0a452 dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours 2015-11-24 23:03:19 +00:00
NewGarbo
81c2d2a11f *just pushing my current changes so that i can start fresh on recoding custom item serialization stuff* 2015-11-24 22:49:28 +00:00
NewGarbo
31afe9f886 removed debug message from undead camp 2015-11-24 22:29:20 +00:00
Shaun Bennett
57302221df Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-24 17:27:46 -05:00
Shaun Bennett
cb7422b4fe Re-enable world events 2015-11-24 17:27:35 -05:00
NewGarbo
befe4d129d formatted PlayerGear.java (to avoid further confusion) 2015-11-24 22:21:01 +00:00
NewGarbo
459e1beeff clans buggy fixers 2015-11-24 22:18:48 +00:00
Sarah
95b4ad74e8 fixed silencing and adding possibilty to change text. 2015-11-24 16:23:03 +01:00
Cheese
d66bad572f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 22:19:59 +11:00
libraryaddict
5799edae50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-24 23:45:42 +13:00
libraryaddict
ddf7528796 Updated CB 2015-11-24 23:45:22 +13:00
Cheese
837be048a6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:38:47 +11:00
Jonathan Williams
f8d8b75586 Changed how timings is used. 2015-11-24 04:36:18 -06:00
Cheese
7e2f5f0657 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:30:45 +11:00
Cheese
11a60a86a9 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-24 21:30:17 +11:00
Jonathan Williams
fbea0e702b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 02:56:40 -06:00
Cheese
c5b5d07627 evade timing 2015-11-24 16:07:11 +11:00
Cheese
913d079623 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 15:23:53 +11:00
Cheese
7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
fooify
f8401e0eeb fixed shield smash and fissure affecting spectators 2015-11-23 17:08:24 -08:00
fooify
f300fd2c98 Merge remote-tracking branch 'origin/master' into foo 2015-11-23 15:34:27 -08:00
NewGarbo
8559a63887 Added all rank names to Clans name blacklist 2015-11-23 22:10:29 +00:00
NewGarbo
3fa0beceb7 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-23 21:39:53 +00:00
Shaun Bennett
ef7c26c04c Clans changes 2015-11-23 15:57:13 -05:00
NewGarbo
91067535db changed getting started tutorial gold reward to be proper (5000 now) 2015-11-23 18:09:50 +00:00
NewGarbo
175a6bc31a cleaned up world event times stuff 2015-11-23 17:24:17 +00:00
NewGarbo
9bae314278 fixed null pointer exception when interacting with a block when your clan home is null 2015-11-23 17:19:00 +00:00
NewGarbo
6ca4d12d98 fixed potential nofall exploit with logout npc 2015-11-23 17:09:51 +00:00
NewGarbo
ce2e616c74 fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-; 2015-11-23 16:57:50 +00:00
Sarah
66598ce97e adding teleport flag. 2015-11-23 16:16:33 +01:00
NewGarbo
da2c7d84a4 tutorial code cleanup. removed qa reset command 2015-11-23 11:19:23 +00:00
NewGarbo
a551e89310 fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT 2015-11-23 09:44:35 +00:00
NewGarbo
58ed9e586c turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial 2015-11-23 09:04:30 +00:00
Jonathan Williams
875b87e0e4 Fixed memory leak crashing servers. 2015-11-23 02:41:38 -06:00
NewGarbo
47abbfbedf implemented skip tutorial being permanent 2015-11-22 20:01:54 +00:00
Morten
19803a00ab Added the Wither Assault fixes to it's own Branch 2015-11-22 19:06:24 +01:00
NewGarbo
2e047b54c2 removed stone weapons from loot 2015-11-22 11:54:38 +00:00
NewGarbo
0cdee95b87 formatted some classes 2015-11-22 11:23:19 +00:00
libraryaddict
cfeafff2f6 EntityDismountEvent stuff 2015-11-22 14:44:32 +13:00
fooify
205643028e fixed slab issue with Assassin's Flash 2015-11-21 11:00:51 -08:00
Sarah
cba5aef9f1 small fix 2015-11-21 18:18:13 +01:00
AlexTheCoder
3bb11bba08 - Fixed Stats [caused by bad communication between chiss and I] 2015-11-21 11:30:53 -05:00
Sarah
6a29d2a2d6 adding some getters. 2015-11-21 17:01:17 +01:00