JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,625 Commits 1 Branch 0 Tags 481 MiB
c9b343a1fb
Commit Graph

6399 Commits

Author SHA1 Message Date
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
Virizion
465f8c28f6 Set FixSpawnFacing to false so that out looking at the middle feature would work. 2015-12-03 21:13:33 -05:00
Virizion
bb708911d6 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 21:10:31 -05:00
Christopher Jozsa
fc68ce9b78 Merge pull request #87 in MIN/mineplex from virizion_utils to master 
* commit '9951701ded301c47bcc203c12001ef866204b78c':
  Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
 2015-12-03 19:05:15 -06:00
Virizion
9951701ded Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it. 2015-12-03 19:51:11 -05:00
fooify
b1bd2ff5ac Gravity's icon changed to ENDER_PORTAL_FRAME 2015-12-03 16:50:27 -08:00
fooify
91aaf5f2fb world's smallest bugfix - admin->co-host 2015-12-03 16:45:30 -08:00
Virizion
c3a564faa7 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 19:31:24 -05:00
fooify
348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08: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
NewGarbo
39daf969fd clan claim visualizer 2015-12-03 22:29:36 +00:00
Sarah
19254fc4a0 Prepare Timer flag. 2015-12-03 18:06:27 +01:00
NewGarbo
584a02ae3e fixed infinite claims 2015-12-03 10:30:06 +00:00
Virizion
ee51766e1f Removed teleports. Made the spawns face the middle but it doesn't work yet because of GameTeam changing the direction again. 2015-12-02 22:12:53 -05:00
Virizion
f0c28e6234 Updated references to the util method. 2015-12-02 20:20:14 -05:00
Virizion
cab5c2a76d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-02 20:12:41 -05: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
Sarah
27f335779a adding tutorial sounds and flag for it. 2015-12-02 19:39:44 +01:00
NewGarbo
e9fd661311 disabled koth 2015-12-02 18:25:53 +00:00
NewGarbo
8fea5afdce fixed message on tick (might be cause of laggg) 2015-12-02 06:56:58 +00:00
NewGarbo
92c1abf221 a few last touches 2015-12-02 06:04:53 +00:00
NewGarbo
8db5ffe5c7 forcejoin command for ADMIN+ and fixed auto tree replanting. 2015-12-02 05:54:00 +00:00
NewGarbo
3a4e453ac3 made it so that you can only use /reset in safe zones 2015-12-02 05:18:04 +00: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
fooify
b04f139883 Fixed advertisement being able to be bypassed by spec and instant join 2015-12-01 19:26:52 -08:00
Virizion
1810defd2d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-01 20:39:54 -05:00
fooify
338e0f1892 fixed naming pets non-alphanumeric characters 2015-12-01 16:23:07 -08:00
NewGarbo
b8e2086928 changes to tutorial 2015-12-02 00:19:48 +00:00
NewGarbo
ba27d94158 fixed skiptutorial message not displaying 2015-12-01 23:23:11 +00:00
NewGarbo
cffb6bd62f bunch o' changes 2015-12-01 23:01:41 +00:00
Keir
9508556d57 Refactor. 2015-12-01 22:47:51 +00:00
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
Sarah
b0e16f6612 Zombie smash Color. 2015-12-01 17:05:55 +01:00
Sarah
d335e58652 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
 2015-12-01 17:01:44 +01: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
Virizion
1ad534366e Switch item dropping to the new util method. 2015-11-30 22:09:15 -05:00
Cheese
208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
Virizion
d24135771f Fixed formatting by adding bodies to all for loops. 2015-11-30 19:10:59 -05:00
Virizion
ae8a10d55d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-30 18:50:21 -05: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
Keir
0bbb705654 Small method & class renames, document methods. 2015-11-30 16:35:07 +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
Keir
4aa84b9180 Store chat messages from the last 30 minutes. 2015-11-30 02:03:26 +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
Virizion
e7960d65e0 Moved classes into separate packages so it is more organized. 2015-11-29 14:36:51 -05:00
Virizion
840b784239 Removed some redundant calls and replaced them with a call to one method. 2015-11-29 13:42:30 -05: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
Virizion
c6f1d29496 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-29 13:09:31 -05: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
Virizion
e09e5851a6 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-29 01:17:17 -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
Virizion
278082caed Finished the checklist. I might recode eliminations since I kind of don't like it right now. 2015-11-28 15:18:06 -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
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
Sarah
e81aa72c7e Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-27 20:33:18 +01: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
Virizion
73c2f16d8b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-26 23:11:12 -05:00
Virizion
3d74c9ca05 Fixed some bugs and finished some items on the checklist, too many to put down here. 2015-11-26 23:10:19 -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
Keir
0ee042f192 Implement equals and hashCode, move compareTo into MessageSnap class. 2015-11-26 23:59:17 +00:00
Keir
3e06451ac1 Whoops, this should be 30 SECONDS, not MINUTES. 2015-11-26 23:50:45 +00:00
Keir
d47b494628 Add /chatcache (mainly for debugging). 
Fix cache not being able to store more than 1 value per sender.
Add comparator to sort all messages chronologically.
 2015-11-26 23:29:43 +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
Keir
edf93ec43f Initial ChatSnap implementation. 2015-11-26 16:55:27 +00:00
Sarah
9e1d522876 Increase Render distance on particles, Don't spawn mob until "protect him from evil minions" title appears and changing some timings. 2015-11-26 16:47:31 +01:00
Sarah
33383af18a Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:37:57 +01:00
Sarah
c74732af39 One more fix. 2015-11-26 16:37:18 +01:00
Sarah
cb67e42f96 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:27:24 +01:00
Sarah
21f859f579 fixing 2 seconds delay. 2015-11-26 16:26:49 +01:00
Sarah
efc05803ac Minion spawn. 2015-11-26 16:25:44 +01:00
Sarah
40259a26f1 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:12:51 +01:00
Sarah
a653f053a5 Adding 2 Seconds delay. 2015-11-26 16:12:13 +01:00
Sarah
9f3c3589b2 Particle render distance. 2015-11-26 16:09:29 +01:00
Sarah
3128a6005b Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 16:06:53 +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
Virizion
fdb4ae6e58 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-25 23:48:35 -05: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
Virizion
de82806fc0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-25 22:53:06 -05: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
Virizion
6a6807d6f0 - Added time left progress bar 
- Added subtitle to countdown 5, 4, 3, 2, 1, TIME'S UP when a build is about to end
- Added an elder guardian who floats and shoots lasers at the losers builds and blows the blocks up with an explosion
- Added a subtitle to show who was eliminated
- Prevented players from entering other build areas
 2015-11-25 22:45:23 -05: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
32ee1c285a merging pregametutorial into type wars. 2015-11-26 00:29:28 +01:00
Sarah
063299ab3a Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 00:23:02 +01: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
Sarah
de9262882a fixing "enemy's" and some merge isssues. 2015-11-25 16:03:13 +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
fac7d152ae Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
 2015-11-24 16:25:44 +01:00
Sarah
2a64d06bdd removing some debug. 2015-11-24 16:24:22 +01:00
Sarah
95b4ad74e8 fixed silencing and adding possibilty to change text. 2015-11-24 16:23:03 +01:00
Sarah
7708f879dc Fixing attack damage. 2015-11-24 16:15:07 +01:00
Sarah
49f6679537 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-11-24 15:43:59 +01:00
Sarah
46362a3d5f Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-24 15:38:52 +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
Keir
f0e24468d5 Enable reporting functionality for Arcade and Clans plugins. 2015-11-22 14:23:17 +00:00
Keir
dcca67e571 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-22 13:54:16 +00: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
Virizion
ddc5427ae3 Merge branch 'master' into virizion_speed_builder 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-21 14:20:53 -05:00
fooify
205643028e fixed slab issue with Assassin's Flash 2015-11-21 11:00:51 -08:00
Sarah
171696ff0d final tutorial implementation. 2015-11-21 18:24:17 +01:00
Sarah
15032ac7ff Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-21 18:19:12 +01:00
Sarah
cba5aef9f1 small fix 2015-11-21 18:18:13 +01:00
Sarah
e10a63254a saving typewars state 2015-11-21 18:16:24 +01:00
AlexTheCoder
3bb11bba08 - Fixed Stats [caused by bad communication between chiss and I] 2015-11-21 11:30:53 -05:00
Sarah
746cc597ab Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-21 17:02:27 +01:00
Sarah
6a29d2a2d6 adding some getters. 2015-11-21 17:01:17 +01:00
Sarah
d0b5f6d8ac starting implementation of Type wars tutorial. 2015-11-21 16:56:56 +01:00
Sarah
01f67e9d3e Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-21 16:37:49 +01:00
Cheese
91e40d0e61 hide testing server MOTD 2015-11-21 13:37:19 +11:00
Cheese
5b8191e57c fixed kick history stack direction 2015-11-21 11:42:59 +11:00
Cheese
02d09f2843 fixed slime dying bug 
removed morphs
 2015-11-21 11:37:17 +11:00
Cheese
9ef99cee20 fixed merge issues 2015-11-21 11:21:54 +11:00
Cheese
6eb1bef1c6 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-11-21 11:09:28 +11:00
Cheese
87a30513de Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-21 11:08:23 +11:00
Cheese
4a0cc79abf fixed silence not working in non-champs servers 2015-11-21 11:08:09 +11:00
AlexTheCoder
8b480cc32b Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 18:40:42 -05:00
AlexTheCoder
1274dc860d - Stuff for chiss 2015-11-20 18:40:20 -05:00
Cheese
2f91ca5a8a fixed errors 2015-11-21 10:35:17 +11:00
Cheese
4a70e4da90 more fixies 2015-11-21 10:34:08 +11:00
Cheese
4d128d9c7a fixed some skills and wierd hitbox error 2015-11-21 10:29:48 +11:00
Keir
5bbf5bcce5 Only log to the database when the report has been closed. 2015-11-20 23:05:42 +00:00
Cheese
c7297a7a38 fixed invalid proxies exploding 2015-11-21 09:45:01 +11:00
Cheese
d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Cheese
e0885feea6 Merge branch 'master' into alex-ctf 2015-11-21 09:40:07 +11:00
Cheese
04be896ff6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-21 09:39:50 +11:00
Sarah
97471b0d9c Finalizing Game Tutorials. 2015-11-20 23:38:02 +01:00
Keir
07b6c7cde7 Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side. 2015-11-20 22:38:00 +00:00
Cheese
0bc64fec16 Proxy limit fixes 2015-11-21 09:28:15 +11:00
Keir
435f2b643d Fix fetching player report stats. 2015-11-20 22:20:56 +00:00
Keir
ad16c59ab7 Forgot to commit this crucial part... 2015-11-20 22:05:10 +00:00
Keir
470ff67f86 Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system. 2015-11-20 22:03:57 +00:00
Cheese
cfc0aa7d05 reverted to size 2 ball 2015-11-21 08:20:02 +11:00
Keir
fc6e1fe003 Notify the handler of a report (if any) when the report they are handling is purged. 2015-11-20 21:10:03 +00:00
NewGarbo
17e62f1f5a Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-20 18:31:37 +00:00
NewGarbo
fb04fac0f6 removed debug message 2015-11-20 18:31:14 +00:00
Sarah
6f7d49b71b Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-20 19:04:51 +01:00
Sarah
2a4d20650a Saving for branch switching. 2015-11-20 19:04:11 +01:00
AlexTheCoder
386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a -B 2015-11-20 05:57:29 -05:00
NewGarbo
521aa8d965 fixed furnaces in undead camp 2015-11-20 09:14:57 +00:00
NewGarbo
08f683aa98 gave Archers in undead camps the barbed arrows effect 2015-11-20 07:49:28 +00:00
Cheese
3067d9f281 final push for the day 2015-11-20 15:22:43 +11:00
Jonathan Williams
700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Jonathan Williams
411d6fdb22 Made PlayerTracker use existing code for determining region. 2015-11-19 22:11:45 -06:00
Cheese
ed2f3a064c MORE ML! 2015-11-20 14:31:01 +11:00
Mysticate
3f37b893d3 Worked on double. 2015-11-19 20:29:20 -05:00
Keir
80c87fa1fc Make reports timeout after 15 minutes of inactivity. 2015-11-20 00:51:21 +00:00
Cheese
3a5ab3f17c Merge branch 'master' into monster-league 2015-11-20 11:51:07 +11:00
Cheese
1cc92cea1b and the files 2015-11-20 11:50:33 +11:00
Cheese
c4745c18b6 ML update 2015-11-20 11:50:20 +11:00
Mysticate
f7011032bc Switching branches 2015-11-19 19:49:46 -05:00
Keir
bceb69bc12 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2015-11-19 23:52:02 +00:00
Mysticate
f02e2b2e72 Formatting 2015-11-19 18:02:07 -05:00
Mysticate
e816a79f37 Reformatted 2015-11-19 17:51:25 -05:00
Mysticate
502f12f00f Fixed paintball to the max. :>> 2015-11-19 17:46:07 -05:00
Cheese
e14f5a36bd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-20 08:34:19 +11:00
Cheese
f33eedf36d text fix 2015-11-20 08:33:51 +11:00
Sarah
0fedb99660 Changing the tutorial visuals and texts. 2015-11-19 21:04:50 +01:00
Shaun Bennett
c29fd242ca Forgot to remove the unnecessary check 2015-11-19 14:46:01 -05:00
Sarah
ad280c96c9 adding interactive Chat elements. 2015-11-19 20:45:40 +01:00
Shaun Bennett
f47a61e38e Use bounds for energy tracker messages aren't displayed multiple times 2015-11-19 14:44:03 -05:00
Shaun Bennett
63e580404c Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
 2015-11-19 14:36:08 -05:00
Shaun Bennett
3820035762 Cleaning up duplicate code/small optimizations (untested) 2015-11-19 14:35:59 -05:00
NewGarbo
b0c60fd1f4 sparkly rare items! woo. and fixed gold dropping waaayyy too much 2015-11-19 19:03:51 +00:00
NewGarbo
7d8e1b517d Fixed dropped gold stacking... 2015-11-19 08:56:07 +00:00
NewGarbo
f262a22913 Fixed loot dropping in King of the Hill not dropping correct items/ 2015-11-19 08:54:59 +00:00
NewGarbo
6372dfd629 fixed ArithmeticException / 0 in ClansEnergyTracker. 2015-11-19 08:29:50 +00:00
Virizion
975b1df477 Added the title message when a perfect match. Turns out having a '%' in the text caused it not to appear. 2015-11-18 22:03:04 -05:00
fooify
6d0879a175 Re-fixed Barbarian bug 2015-11-18 17:31:28 -08:00
Virizion
796f116cfd Merge branch 'master' into virizion_speed_builder 2015-11-18 19:27:42 -05:00
Virizion
937d024ea5 Empty builds are auto eliminated. Damage player 9001 so the elimination is handled by the managers and not us. If there are not enough build areas for the players, the game ends. Shows a message that you completed the build if you complete it correctly. It also plays a sound. It would have a title but the title wasn't showing up for some reason... 2015-11-18 19:26:19 -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
William Burns
4620a5a162 Hub fix 2015-11-18 21:47:52 +00:00
Sarah
a8ba1f1ea6 some perspektive changes to the tutorial and removing prepare timer. 2015-11-18 22:33:47 +01:00
Virizion
76db2710ae It should have been all got the build 100% correct not all got the same score. 2015-11-18 16:10:44 -05: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
Keir
cb5672b94c Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-18 20:34:24 +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
William Burns
6fa2a58f5d Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global 2015-11-18 18:50:09 +00:00
William Burns
0e1c72e25d testing excludes 2015-11-18 18:46:51 +00:00
Sarah
f2830e653e Making last changes to the tutorial 2015-11-18 19:25:12 +01:00
NewGarbo
16eecdd112 fixed clan energy alerts going off incorrectly 2015-11-18 17:30:45 +00:00
Sarah
bff9a065d9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-11-18 18:08:51 +01:00
Sarah
64970ab8d6 adding little tutorial at the start of the game. 2015-11-18 17:53:35 +01:00
NewGarbo
5c2569e822 revert certain permissions from being ALL or containing JR.DEV (that were used for testing) 2015-11-18 16:20:27 +00:00
Shaun Bennett
1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master 
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
 2015-11-18 10:15:33 -06:00
William Burns
a11ca138e7 ranks 2015-11-18 16:01:53 +00:00
William Burns
04a4b072af woops easy fix 2015-11-18 15:48:25 +00:00
William Burns
2e223d0660 rawr and fixes 2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns
e83b49d490 Reformatting titles 2015-11-18 13:43:22 +00:00
NewGarbo
5c383a1df3 cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy 2015-11-18 12:24:28 +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
NewGarbo
cd0ce57691 replaced useless looping with just checking the rotation of the bed. 2015-11-18 09:58:06 +00:00
NewGarbo
1ea87b8354 Fixed an NPE when destroying a Clan's Home 2015-11-18 09:37:32 +00:00
NewGarbo
03764ad480 removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff. 2015-11-18 08:40:24 +00:00
NewGarbo
f5e12e5014 formatted ClansGame.java (separate commit because confusion otherwise) 2015-11-18 08:37:34 +00:00
NewGarbo
77f234e5f5 Made energy warnings stay for longer 2015-11-18 08:32:48 +00:00
NewGarbo
185f19fb6a fixed clan energy warnings being sent to all players on the server instead of the clan. 2015-11-18 08:13:13 +00:00
NewGarbo
6da628abe1 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-18 07:40:35 +00:00
NewGarbo
f79c282225 Clan energy warnings implemented. (not tested yet) 2015-11-18 07:39:00 +00:00
Virizion
8145b127ba Changed the score algorithm so if all players have the same score, nobody is eliminated. 2015-11-17 20:04:23 -05:00
fooify
4198e73120 Fixed SG Barbarian bug 2015-11-17 16:05:49 -08:00
Shaun Bennett
4f63d90bac Only show player location for allies/self 2015-11-17 18:42:06 -05:00
Shaun Bennett
01a57dde2f Fix formatting of ally messages 2015-11-17 18:39:15 -05:00
Shaun Bennett
52c55335fa Add chunk to unclaim map 2015-11-17 18:33:21 -05:00
Shaun Bennett
ab8f9cb992 Fix map color 2015-11-17 18:31:38 -05: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
c23b2f54f5 Removed arbitrary boundary around admin territories (Chiss' request) 2015-11-17 22:41:51 +00:00
NewGarbo
9b866145ea Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-17 22:24:58 +00: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
William Burns
e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns
a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
Mysticate
1342a8ac9f Class 2015-11-17 11:38:15 -05:00
Mysticate
448dd33c1a Switching branches c: 2015-11-17 11:38:02 -05:00
Keir
6ee40aa1ce No longer close reports when the player quits, instead alert the handler and alert again when (and if) the player re-joins if the report is still active. 2015-11-17 15:08:35 +00:00
Keir
a1713ca866 If someone is currently handling a report, re-direct all messages relating to that report to them. 2015-11-17 14:21:05 +00:00
William Burns
0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +00:00
Shaun Bennett
6187b5e680 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-16 17:34:47 -05:00
Shaun Bennett
c3cd0e3ad2 Fix chat formatting, open clan shop with /c 2015-11-16 17:31:24 -05:00
libraryaddict
f95bec0f15 Fix up mapmanager, untested 2015-11-17 11:30:04 +13:00
Shaun Bennett
a153ffdc38 Fix enchant tables opening the wrong gui 2015-11-16 17:29:25 -05:00
Shaun Bennett
5b30cfb67e Fix War Points bug 2015-11-16 17:27:56 -05:00
Cheese
adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese
46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
Shaun Bennett
007d5a00dc Merge remote-tracking branch 'origin/master' 2015-11-16 16:39:43 -05:00
Shaun Bennett
e35eec4cb1 Update motdmanager and compiler.xml 2015-11-16 16:39:34 -05:00
libraryaddict
208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00
NewGarbo
0d372cefaa Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-16 19:41:46 +00:00
NewGarbo
181642e200 give undead warriors stone swords. 2015-11-16 19:41:09 +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
Shaun Bennett
2627aa9933 War/War Points Update 2015-11-16 14:37:32 -05:00
Virizion
2e9ac8df4d First commit. 2015-11-15 22:06:11 -05:00
Jonathan Williams
88dbe261db Added logging for stacker. 2015-11-15 18:34:35 -06:00
Jonathan Williams
ac792dcd02 Removed some unnecessary code in updateRank and opened up all ranks to be used. 2015-11-15 18:33:43 -06:00
AlexTheCoder
217509b75a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
 2015-11-15 18:58:20 -05:00
libraryaddict
e5b376bc5c Fixed wrong CB 2015-11-16 12:48:26 +13:00
AlexTheCoder
667edc8a90 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-15 17:48:16 -05:00
AlexTheCoder
ecaa4a49b4 - Fix for stats 2015-11-15 17:48:00 -05:00
NewGarbo
580ec27738 hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces. 2015-11-15 21:03:48 +00:00
NewGarbo
c6f73d6e9a oh deary me, i appear to have gone on a rampage of changing everything to interfaces. 2015-11-15 21:01:27 +00:00
NewGarbo
24dee0ebf6 updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!! 2015-11-15 20:52:45 +00: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
NewGarbo
10eb1bb9c9 enum change didn't commit in the last commit ugh 2015-11-15 19:57:16 +00:00
NewGarbo
22ae67ba81 king of the hill changes. (renamed enum for it for ease of typing) 2015-11-15 19:57:00 +00:00
NewGarbo
c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
libraryaddict
aaf3705cc7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-16 06:57:09 +13:00
libraryaddict
6e55074211 Add entitydismountevent 2015-11-16 06:56:39 +13:00
Mysticate
399edbab29 Sniper work 2015-11-15 12:47:45 -05:00
NewGarbo
2aa7dd13c3 fixed NullPointerException 2015-11-15 15:05:18 +00:00
NewGarbo
1d8366487b Fixed King of the Hill from not working at all, and some other tiny fixes 2015-11-15 14:33:29 +00:00
NewGarbo
33d358ac6a Quick fix in EventTerrainFinder because of incorrect block checking. 
Added a constant "GOLD_PER_TICK" in the King of the Hill code, because hardcoded numbers are no fun.
Commented out some strange useless code.

Renamed getTicks() to getTicksRunning() and _ticks to _ticksRunning.
 2015-11-15 12:09:31 +00:00
NewGarbo
e28059848c New 1.7 leaves fix for UtilBlock#getHighest() 2015-11-15 08:51:59 +00:00
NewGarbo
1398987ff7 Removed currently unused world event types. 2015-11-15 08:49:44 +00:00
NewGarbo
321d840cfd Throwing RuntimeException instead of legacy assert expression. 2015-11-15 08:28:57 +00:00
fooify
5767d4e2db SSM bug fix: magma cube flame dash doesn't make player invisible 2015-11-14 16:08:14 -08:00
Shaun Bennett
f90b137ccd Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-14 16:46:03 -05:00
NewGarbo
e4981c7491 Undead camp finishing stuff 2015-11-14 20:30:37 +00:00
Mysticate
746aab7786 Merge remote-tracking branch 'origin/master' into Myst_KITS 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java
 2015-11-14 14:50:48 -05:00
fooify
db21d627d8 Merge remote-tracking branch 'origin/master' into foo 2015-11-14 09:13:51 -08:00
Jonathan Williams
daee44d262 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-14 02:01:24 -06:00
Shaun Bennett
9f37e3e595 Merge remote-tracking branch 'origin/master' 2015-11-14 01:46:44 -05:00
Shaun Bennett
2bb82da735 Motd update 2015-11-14 01:45:55 -05:00
Jonathan Williams
4a73bce586 Added gadget and projectileUser logging. 2015-11-14 00:36:34 -06:00
Shaun Bennett
487f974951 Clan Gui updates and code cleanup 2015-11-13 23:53:34 -05:00
Cheese
e7b86b4462 hub skytext 2015-11-14 13:05:11 +11:00
Cheese
60a6a81587 faster cleanup 2015-11-14 13:03:41 +11:00
Cheese
9518b64e3c clean up snowballs 2015-11-14 12:55:43 +11:00
Cheese
259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
fooify
f9f4c2addc fixed several smash bugs and one global issue 2015-11-13 17:28:25 -08:00
Cheese
770e2be44b Merge branch 'master' into alex-ctf 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-11-14 11:07:44 +11:00
Cheese
5586132429 champions balance 2015-11-14 11:05:51 +11:00
NewGarbo
8a972075da Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits) 2015-11-13 21:19:50 +00:00
NewGarbo
a0ac15dec5 Allowed Jr.Devs to start/clear world events. 2015-11-13 21:01:09 +00:00
NewGarbo
98be3a51a0 Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event. 2015-11-13 21:00:08 +00:00
NewGarbo
010f30f064 Made the alpha login message only send one (forgot to save the task manager stuff) 2015-11-13 20:57:33 +00:00
Shaun Bennett
8ba9a8f6c4 Fix border radius 2015-11-12 22:38:26 -05:00
Shaun Bennett
40138b6914 1.8 fix 2015-11-12 22:35:56 -05:00
Shaun Bennett
f3e94cc035 Map fix (probably broken?!) 2015-11-12 21:35:01 -05:00
AlexTheCoder
016e54977d - Finish game [FINALLY] 2015-11-12 21:16:58 -05:00
Keir
bf81c26874 Only notify staff when a report count reaches a certain amount (3 for hacking, 1 for chat abuse). 2015-11-13 01:27:34 +00:00
Keir
a6d3ba10c2 Show the handler of the report a message every 10 seconds whilst they are handling a report. Any part of the message is clickable and when clicked shows the close report GUI. 
Jazz-up messages sent to players.
Rename Category to ReportCategory.
 2015-11-13 01:23:33 +00:00
Cheese
9de3981dec ms update 2015-11-13 11:24:11 +11:00
fooify
a0c0f6b891 Slightly bumped Monster Maze jump time value 2015-11-12 16:19:33 -08:00
Shaun Bennett
bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett
639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett
c4e188296a Fix compiler and misc 2015-11-12 17:55:00 -05:00
Shaun Bennett
0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Cheese
3122397f7a Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
 2015-11-13 09:19:44 +11:00
Shaun Bennett
6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05:00
Sarah
4958ce347d Fixing boss not despawning bug, scoreboard end bug and some achievements. 2015-11-12 18:41:40 +01:00
AlexTheCoder
bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
AlexTheCoder
a8b27e66d1 - Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit 
- Fixed items ever being lost from treasurechests
 2015-11-12 00:06:21 -05:00
fooify
ac4a276aff fixed bridge bug "Death Bomber counts suicides as well" 2015-11-11 20:38:36 -08:00
fooify
8a0906587d Merge remote-tracking branch 'origin/master' into foo 2015-11-11 20:15:31 -08:00
Shaun Bennett
875c399c9f Merge branch 'master' into clans-beta 2015-11-11 21:31:03 -05:00
Shaun Bennett
33680e829a Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-11 21:25:32 -05:00
Keir
27d5c76376 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-12 02:01:01 +00:00
libraryaddict
25f299b490 Fix interact types 2015-11-12 14:34:12 +13:00
Keir
3c419b3217 Small fixes from last commit. 2015-11-12 00:24:31 +00:00
Keir
6295a8ce08 Closing a report will now display a GUI in which the closer can decide on the result of the report. Some of these options will yield additional options, such as punishment options if a report is indeed valid. 
Store count of a players accepted, denied and abusive reports.
The previous partially implemented reputation system has been removed, at least for now.
 2015-11-12 00:02:38 +00:00
Shaun Bennett
e66bebcfb1 Give all treaure items when opening the chest 2015-11-11 18:13:47 -05:00
Shaun Bennett
994a9e3e43 Clans Gui Work, commiting so I can switch branches 2015-11-11 18:05:48 -05:00
NewGarbo
ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
Keir
9573751a87 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-11 19:24:34 +00:00
Keir
727da2c6b5 Embarrassing typo. 2015-11-11 19:23:10 +00:00
Keir
f2e88c1c54 Only allow 1 player at a time to handle a report. 2015-11-11 19:05:29 +00:00
Keir
d7ba2e4731 Fix infinite gson loop by separating dependencies. 2015-11-11 16:12:28 +00:00
libraryaddict
ba7515f761 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-12 04:27:17 +13:00
libraryaddict
b915131407 Fix some armorstands and interaction bugs 2015-11-12 04:26:55 +13:00
Keir
9c45a48a26 Add confirmation message when a report is successful. 2015-11-11 15:05:36 +00:00
Keir
2722aeaaec Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-11 14:53:49 +00:00
Keir
191fa0ec53 Actually fetch the showUserReports value from the database. 2015-11-11 14:53:22 +00:00
Jonathan Williams
27ef2c0bbb Fixed UtilEnt.Leash method. 2015-11-11 04:36:10 -06:00
Jonathan Williams
0e6146d5c9 Added expire to Stacker throw. 2015-11-11 04:32:56 -06:00
Cheese
3ed680e1c2 ms update 2015-11-11 15:55:48 +11:00
Cheese
ef2411b7d5 Merge branch 'master' into minestrike-update 2015-11-11 13:43:36 +11:00
libraryaddict
3e6d73221b Disabled a fix 2015-11-11 15:21:17 +13:00
Cheese
4dd9b0967a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-11 12:50:07 +11:00
Cheese
a47752cfe2 disabled usage of /minecraft: commands in 1..8 2015-11-11 12:49:19 +11:00
Cheese
d971e3c8a3 ms update 2015-11-11 12:46:58 +11:00
libraryaddict
ee286c2676 Disable /minecraft commands 2015-11-11 13:49:06 +13:00
libraryaddict
7559d1feb5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-11 11:45:40 +13:00
libraryaddict
f18c55cbd9 Fix schedulers 2015-11-11 11:45:17 +13:00
Keir
f1c8564263 Fix preference inventory. 2015-11-10 21:40:35 +00:00
Keir
7d63a95ec9 Remove ALTER statement, modifications have been done. 2015-11-10 21:22:21 +00:00
Keir
fa9530b5bf Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-10 21:06:03 +00:00
Cheese
e3c22b356b Merge branch 'master' into minestrike-update 2015-11-11 07:54:28 +11:00
Cheese
4eaa165826 such format 2015-11-11 07:54:13 +11:00
Cheese
59a054eeba fixed merge erorr 2015-11-11 07:52:02 +11:00
Cheese
520eb55b88 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-11 07:43:50 +11:00
Cheese
b3125e40ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-11 07:43:01 +11:00
Keir
a81da156ac Load show user reports value from database. 2015-11-10 16:08:16 +00:00
Keir
e59b5c2549 Actually show the report toggle action. 2015-11-10 16:07:32 +00:00
fooify
394d680470 Merge remote-tracking branch 'origin/master' into monster-league 2015-11-10 07:09:19 -08:00
fooify
ca1177685f totally WIP commit 2015-11-10 07:08:08 -08:00
Keir
ff65231912 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-10 11:38:29 +00:00
Keir
217ac78d49 Alter "accountPreferences" table to include a new column "showUserReports". 2015-11-10 11:38:13 +00:00
libraryaddict
6983af944f Fix a craftbukkit bug 2015-11-11 00:25:20 +13:00
libraryaddict
37fdf53a51 Fixed champion's Illusion crash 2015-11-11 00:21:28 +13:00
Keir
e00c11ae28 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-10 11:17:49 +00:00
AlexTheCoder
d654f1f4b1 - Fixed class edit in lobbies 
- Fixed conflict between rave suit and assassin
 2015-11-10 06:17:25 -05:00
libraryaddict
1a2c163ce2 Fix scoreboard out of bounds error 2015-11-11 00:03:08 +13:00
AlexTheCoder
e165cad50f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-10 04:53:32 -05:00
Jonathan Williams
6e90052480 Updated StaffServer to 1.8 2015-11-10 02:01:39 -06:00
Cheese
0a9c97c32a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 18:05:01 +11:00
Shaun Bennett
2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Keir
47c509c975 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
 2015-11-09 22:55:00 +00:00
Cheese
83248a8fec Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 09:11:27 +11:00
Cheese
0ae5330634 squid changes 2015-11-10 09:11:10 +11:00
NewGarbo
1aef7fe0b9 bunch of fixes reported by qa in tutorials. 2015-11-09 20:46:38 +00:00
NewGarbo
f1fbe086d3 oh how fun, even more constructor errors! 2015-11-09 20:29:52 +00:00
NewGarbo
af6e28f14b don't you worry Shaun, I gotcha back with fixing them constructor problems ;) 2015-11-09 20:29:27 +00:00
NewGarbo
c6ff845efa arcade weird thingy 2015-11-09 20:28:41 +00:00
Shaun Bennett
8850737f71 Fix constructor issues 2015-11-09 15:22:15 -05:00
Shaun Bennett
0bb3f8adb1 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/.idea/dataSources.xml
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2015-11-09 14:41:16 -05:00
Shaun Bennett
610b5dbeb2 More work on gui 2015-11-09 14:39:52 -05:00
Keir
03a5954224 Handle saving and loading of the ShowUserReports setting. 2015-11-09 18:35:03 +00:00
Sarah
18ab3d0f5b Mob shrinking and some Word fixes. 2015-11-09 15:40:49 +01:00
Jonathan Williams
5c89124eb6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 03:25:02 -06:00
Jonathan Williams
ba7d5bbcdc Fixed Arcade! 2015-11-09 03:24:20 -06:00
Shaun Bennett
ec3427bcc0 Giveaway manager bug fix 2015-11-09 04:08:26 -05:00
NewGarbo
7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
 2015-11-09 08:59:37 +00:00
Shaun Bennett
05b52614fe Forgot to remove debug code for testing 2015-11-09 03:49:12 -05:00
NewGarbo
0409d7ffef Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-09 08:48:12 +00:00
NewGarbo
4232a5675f fixed bug with part 5 of the getting started tutorial (has to do with claiming events) 2015-11-09 08:45:34 +00:00
NewGarbo
8f507c4b9c typo 2015-11-09 08:29:51 +00:00
Shaun Bennett
2eaa326929 Merge remote-tracking branch 'origin/master' 2015-11-09 03:27:50 -05:00
Shaun Bennett
2c54e9e59a Giveaway extras 2015-11-09 03:27:42 -05:00
Jonathan Williams
fb4978305f Fixed up EnjinTranslator 
Added extra overload for inventoryManager if you have the accountId already.
 2015-11-09 02:26:45 -06:00
Shaun Bennett
2a7b272de3 Merge remote-tracking branch 'origin/master' 2015-11-09 01:55:36 -05:00
Jonathan Williams
283a774e03 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 00:04:55 -06:00
Jonathan Williams
4915ebc5ad Added Purchase logging manager for Enjin. 
Added extra callback method for SaveRank.
 2015-11-09 00:04:38 -06:00
Jonathan Williams
ff936784d3 Remove debug code. 2015-11-08 17:27:00 -06:00
Jonathan Williams
e86623c8d0 Disabled TrickOrTreatManager to test for Lobby lockups. 2015-11-08 17:26:43 -06:00
Jonathan Williams
fd3ccf7ce0 Fix Bungee lobby balancer code. 2015-11-08 17:25:54 -06:00
libraryaddict
d466005c35 Fix custom names not changing 2015-11-09 05:08:08 +13:00
libraryaddict
752d8152d2 Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
  Fix for some preferences not applying correctly.
 2015-11-08 08:23:20 -06:00
libraryaddict
1999e09e69 Update CB 2015-11-09 02:44:16 +13:00
libraryaddict
ce3af6cf9c Update cb.jar 2015-11-09 00:15:28 +13:00
AlexTheCoder
9e24a5005f - Completed CTF 2015-11-08 03:04:17 -05:00
AlexTheCoder
211298327f - Fixed banners, begun work on patterns 2015-11-08 02:42:31 -05:00
AlexTheCoder
dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05:00
AlexTheCoder
fb7fcccf24 - Reverting back to banners 2015-11-08 01:01:18 -05:00
libraryaddict
e039f2249c Update cb 2015-11-08 18:02:36 +13:00
libraryaddict
c4d6bcba02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-08 17:56:34 +13:00
Shaun Bennett
3c82574386 Testing pushing/ignore this 2015-11-07 20:02:07 -05:00
Shaun Bennett
ffc389f9c7 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 19:58:12 -05:00
Shaun Bennett
af1d91913b Clans gui work 2015-11-07 19:58:03 -05:00
Cheese
cc2e5bc6e4 minestrike update! 2015-11-08 11:30:19 +11:00
NewGarbo
9a70d33b17 Fixed clans user directory being wrong on test servers (because a backslash ['\'] is not seperator for certain OS). Changed /gear command rank back to Admin, and added assassin armor to the gear GUI. 2015-11-07 20:26:43 +00:00
Shaun Bennett
addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
Shaun Bennett
bf97cf5d77 Remove debug code 2015-11-07 13:53:34 -05:00
libraryaddict
79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-11-07 21:36:36 +13:00
libraryaddict
627ce08113 Add info on note particle 2015-11-07 21:35:26 +13:00
Shaun Bennett
e1f56a5d5a Merge remote-tracking branch 'origin/master' 2015-11-07 01:10:34 -05:00
Shaun Bennett
ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Cheese
c922c3248c disabled trick or treat 2015-11-07 13:36:16 +11:00
Cheese
f4bf685e96 removed halloween hub 
removed titan giveaway and pumpkins
 2015-11-07 13:20:29 +11:00
Shaun Bennett
4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett
3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
AlexTheCoder
fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
 2015-11-06 18:43:11 -05:00
Keir
783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00:00
Keir
fd2a543418 Add "ShowUserReports" preference (however currently not visible to players nor does it get saved to the DB currently). 
Fix variable names in ReportManager.
 2015-11-06 16:46:10 +00:00
libraryaddict
d3d448ccfe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-07 04:47:37 +13:00
libraryaddict
cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
NewGarbo
b835823230 Preferences page changes to free up space, as the current preferences layout is completely full. 
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
 2015-11-06 13:19:02 +00:00
NewGarbo
7675b00999 Dominance event. Shaun will have to call the new events once he's done with Dominance. 2015-11-06 07:11:06 +00:00
Keir
0c0b3708c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-06 01:34:13 +00:00
Keir
e449e47b9a Document ReportNotification. 2015-11-06 01:33:46 +00:00
Sarah
56966d690f Fixing random Creepers, adding giant is under Attack message, adding start message, small fixes 2015-11-05 22:56:07 +01:00
AlexTheCoder
87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00
AlexTheCoder
61653347c7 - Fixed proximity weapons not being able to detonate 2015-11-05 02:11:20 -05:00
AlexTheCoder
9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo
1375623625 Added alpha messages. 2015-11-04 17:03:52 +00:00
libraryaddict
77125b3a24 Don't re-set scoreboard lines 2015-11-05 01:10:08 +13:00
libraryaddict
31b4fbec15 Fix a null 2015-11-05 00:49:26 +13:00
libraryaddict
0352e52a68 Tentative beginnings of wider scoreboards 2015-11-05 00:42:45 +13:00
NewGarbo
3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict
a0676b7bcf Fix tnt in SG being usable during DM invul 2015-11-04 21:44:10 +13:00
Sarah
ee7006a3de Giant makes Sounds, lifted up Giant, randomize Minions by time played, changing spawn Items. 2015-11-04 07:17:15 +01:00
libraryaddict
21d10e4bec Fix typo 2015-11-04 19:15:06 +13:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
NewGarbo
8033b40011 made math in GearPage a tiny bit more understandable 2015-11-04 01:27:33 +00:00
NewGarbo
ed1e394a84 removed an unused type and a bit more cleanup; getting ready to clean up GearPage, which is... *shudders* 2015-11-04 00:09:46 +00:00
NewGarbo
a455804dce some Tutorial code cleanup 2015-11-04 00:07:32 +00:00
NewGarbo
4bf92ce0a0 gah why isn't this working?! git is annoying!!! 2015-11-03 23:47:35 +00:00
NewGarbo
ecd3b0ef76 removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay! 2015-11-03 22:06:23 +00:00
NewGarbo
b7bf4765c4 DANG YOU WILLIAM 2015-11-03 22:05:17 +00:00
NewGarbo
7f03ca0936 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
 2015-11-03 21:19:17 +00:00
NewGarbo
78ab895a14 Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds. 
Made it so that players using the broadsword's effects cannot attack anything.

Added small smoke particle to UtilParticle.

Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.

Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.

Removed some debug messages thrown around the code.
 2015-11-03 19:49:14 +00:00
Keir
72b650086d Instantiating a page shouldn't cause it to automatically open. 2015-11-03 17:03:09 +00:00
Keir
bd6ce21cf7 Make use of foreign keys in table creation and drop "INDEX" statements (foreign keys are auto-indexed). 2015-11-03 16:40:31 +00:00
Keir
6054bfaac4 Do all database operations asynchronously. 2015-11-03 15:37:39 +00:00
Keir
9030b4f264 Remove unused column 'date'. 2015-11-03 15:27:32 +00:00
libraryaddict
c25b1969de More progress 2015-11-04 04:00:53 +13:00
libraryaddict
f66c85d5b0 When clearing or getting items from player inventory, get it from player crafting as well 2015-11-03 18:57:41 +13:00
AlexTheCoder
c518221f6b - Fix Merge Error 2015-11-02 22:14:48 -05:00
AlexTheCoder
c41d01e213 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes 
Conflicts:
	Plugins/Mineplex.StaffServer/.classpath
 2015-11-02 22:09:18 -05:00
AlexTheCoder
89c9f19c69 - Fixed MPS Whitelist 2015-11-02 22:08:02 -05:00
libraryaddict
975ad9e6ea Update to master 2015-11-03 15:05:56 +13:00
libraryaddict
3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
 2015-11-03 14:57:25 +13:00
libraryaddict
7496ed763a Fix wither and dead bodies bug 2015-11-03 14:41:34 +13:00
Shaun Bennett
4794cc6924 Clans Gui 2015-11-02 20:41:08 -05:00
libraryaddict
3f66e11b3d Add fence to non-full-solids 2015-11-03 12:39:13 +13:00
Keir
95c38b1939 Don't use static instances. 2015-11-02 23:30:06 +00:00
Jonathan Williams
8838ea75e4 Some code cleanup for tasks. 2015-11-02 09:37:11 -06:00
Jonathan Williams
3b38302429 Optimized TaskManager task locks and calls. 
Run all player messages on the main thread.
 2015-11-02 09:35:35 -06:00
NewGarbo
27c6ef4e9d Success! Finished all events woohoo! 2015-11-02 10:16:13 +00:00
NewGarbo
0bc8413430 test 2015-11-02 10:11:54 +00:00
NewGarbo
74c0eac141 Bunch of fixes and new stuff: 
Cleaned up code everywhere.
Added a ClanCreatedEvent (accidentally formatted ClansDataAccessLayer ooooops)
Removed the tutorialManager access from ClansManager, as it is unneeded now.

Added Lapis Lazuli block particles to Alligator's Tooth (Sammy's request.)

Fixed NPE in TutorialTask#onFinish(Player);
 2015-11-02 08:04:38 +00:00
Jonathan Williams
55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Jonathan Williams
3a0b8d75a2 Added new support member. 2015-11-01 22:09:50 -06:00
Jonathan Williams
18bdcbec62 Fixed some NPEs with TrickDialogue 
Added debug messages for Tricks.

Cleanup of monster targets in HubManager.
 2015-11-01 22:09:36 -06:00
Shaun Bennett
9cf62cfe7f Don't use player skulls until caching is setup and working properly 2015-11-01 22:58:22 -05:00
Cheese
cdb0fcae75 modified hideme a little :) 2015-11-02 14:37:12 +11:00
Sarah
da6bf27c77 Staff with a higher rank can see lower rank and same ranked vanished staff. 2015-11-02 04:32:07 +01:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
Sarah
ebf5ad4a4e adding boss Mobs and changing win mechanic. 2015-11-01 22:32:25 +01:00
Keir
4b5ddf5385 Disable SQL create table queries until they are approved. 2015-11-01 19:14:29 +00:00
Sarah
7c42dc3483 fixinf random Freaks. 2015-11-01 18:33:19 +01:00
Keir
d09ed2a823 Small changes and missed changes from last commit. 2015-11-01 16:47:54 +00:00
Keir
93a5ebf0eb Pass server name to ReportManager. 2015-11-01 16:44:02 +00:00
NewGarbo
baa4a744fb Fixed a whole load of bugs: 
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
 2015-10-31 23:11:12 +00:00
Jonathan Williams
5c2ade8270 Updated staff list. 2015-10-31 14:55:34 -05:00
Jonathan Williams
f16eee220d Removed Debug messages. 2015-10-31 14:55:18 -05:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Sarah
71bb03420b Adding sounds to spells, removing kits, notifications to Titles, Mob sizes/standardization, nuke -> Zombie Smash, 10 secs delay to Zombie Smash, Firebomb improvements and Freaks. 2015-10-31 18:37:19 +01:00
Cheese
92a2c2ebaa fixed npe in kit npc creation 2015-10-31 19:55:58 +11:00
Cheese
b8b260bca1 fixed expire time on projectiles 2015-10-31 19:01:49 +11:00
Cheese
c463b80fe0 fixed insta-expire 2015-10-31 19:00:28 +11:00
Cheese
5d58c56c27 fixed kit bug 2015-10-31 18:31:13 +11:00
Cheese
3636fdfba0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-31 18:23:06 +11:00
Cheese
225f067ab3 fixed some projectile stuff 2015-10-31 18:22:53 +11:00
Shaun Bennett
cd15df0238 Merge remote-tracking branch 'origin/master' 2015-10-31 02:13:24 -04:00
Shaun Bennett
71e49854db Add halloween hats 2015-10-31 02:10:15 -04:00
Mysticate
1a6617bce1 Changes. 2015-10-31 02:05:03 -04:00
libraryaddict
519dceb72e Doublejumping downwards is a no no 2015-10-31 19:02:58 +13:00
Cheese
23be8aa1dd removed unncessary stuff 
balanced rewards
 2015-10-31 14:33:41 +11:00
Cheese
a92a52f009 Merge branch 'Myst_TRICKORTREAT' 2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00
Cheese
b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
NewGarbo
878f7aeafd Potentially fixed the problem where your NPC skeleton sticks around after you log in, and attacks you. 2015-10-30 22:48:40 +00:00
NewGarbo
f54da4ee78 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-10-30 22:20:33 +00:00
NewGarbo
396ce75087 Bug fixes/Additions: 
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
 2015-10-30 22:13:19 +00:00
libraryaddict
301b8012ff Final commit 2015-10-30 19:30:17 +13:00
libraryaddict
ea1e4b79f7 Changes from SnD branch 2015-10-30 19:25:02 +13:00
libraryaddict
ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +13:00
libraryaddict
da0a99d662 Spawn facing fixes 2015-10-30 16:06:47 +13:00
libraryaddict
50edf557ab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-30 15:57:36 +13:00
libraryaddict
388aa1611c Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate 2015-10-30 15:44:37 +13:00
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
Keir
ec5cbbe684 This method is not required, "Plugin" is protected, not private as I previously assumed. 2015-10-30 01:05:45 +00:00
Keir
e266acaf44 Store report categories with a TINYINT to save space and increase lookup performance. 2015-10-29 23:33:23 +00:00
Keir
e8c01a1733 Cleanup imports. 2015-10-29 23:29:38 +00:00
AlexTheCoder
0be51d5629 - Even more bugfixes 2015-10-29 16:48:51 -04:00
Keir
1857afa826 Log report category to database. 
Allow report to easily be handled by clicking text to fire the reporthandle command.
 2015-10-29 17:51:17 +00:00
Shaun Bennett
401350e85d Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-29 13:14:33 -04:00
Shaun Bennett
364d8b05af Fix war invasion 2015-10-29 13:14:27 -04:00
Shaun Bennett
e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
NewGarbo
66a4b148e1 Fixed put on armour task being inconsistent. 2015-10-29 13:44:11 +00:00
NewGarbo
0c5e34ad84 Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones! 2015-10-29 12:56:00 +00:00
Keir
d23230504f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-10-29 12:20:27 +00:00
libraryaddict
7fca42b0e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
 2015-10-29 21:41:59 +13:00
libraryaddict
14df456b3d Progres 2015-10-29 21:39:38 +13:00
NewGarbo
d0bfb2e2e9 Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event. 2015-10-29 08:35:24 +00:00
Aaron Brock
acc915c34e Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch. 2015-10-29 01:12:12 -04:00
Aaron Brock
8dd80094b4 Fixed a little boolean derp that stopped people from breaking blocks. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd)
 2015-10-28 23:26:18 -04:00
Aaron Brock
9df297fc11 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6)
 2015-10-28 23:25:56 -04:00
Mysticate
a707006558 Work. Deemed unsuitable due to an issue with the paintballs flying wide. 2015-10-28 21:42:41 -04:00
NewGarbo
a063da4cae Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts. 2015-10-28 22:55:10 +00:00
NewGarbo
afadd61431 Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int. 2015-10-28 22:47:30 +00:00
AlexTheCoder
cf26541461 - More Bugfixes 2015-10-28 18:16:52 -04:00
NewGarbo
cffcf245e9 UtilItem.java overhaul, complete item attribute system added. 2015-10-28 22:14:08 +00:00
Mysticate
d0e49280a4 Added a sniper kit! :D 2015-10-28 13:34:03 -04:00
NewGarbo
8ce50d1fc7 Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.) 2015-10-28 17:08:48 +00:00
Keir
38425f25fe Add missing child overridden methods for chaining. 2015-10-28 16:03:02 +00:00
NewGarbo
765fb4ce11 Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items. 
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
 2015-10-28 07:34:13 +00:00
libraryaddict
0486404c4b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-10-28 14:38:34 +13:00
libraryaddict
5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13:00
Keir
dd321439a6 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-10-27 22:40:23 +00:00
Keir
4ceb8f20aa Make ReportNotification capable of sending json messages. 2015-10-27 22:26:02 +00:00
Keir
cb1c779f37 Close player report if the reported player leaves the game mid-report. 2015-10-27 22:15:06 +00:00
Keir
d9fb0adabb Only notify staff if 3 or more players report a player. 2015-10-27 22:14:33 +00:00
Keir
53f2356cba Handle null report closers. 2015-10-27 22:08:42 +00:00
Keir
bc3a119a22 Store report category and only "merge" reports when the category is the same. 2015-10-27 17:30:47 +00:00
NewGarbo
8d5b6e6d90 Don't show weakling particles above players that are not alive. Also removed debug message. 2015-10-27 10:18:14 +00:00
NewGarbo
1938bcf799 Fixed the "weakling" status not updating correctly. 2015-10-27 10:01:33 +00:00
NewGarbo
b4897e91fa Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately. 2015-10-27 08:56:41 +00:00
NewGarbo
234799e55e Fixed infinite recursion in AlligatorsTooth. 
Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on.
Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.
 2015-10-27 08:32:21 +00:00
AlexTheCoder
0ab3213b7b - Fixed permanent dwarf toss bug 
- Fixed skills being active while player is editing class
 2015-10-27 01:38:41 -04:00
AlexTheCoder
9d6a361602 - Fixed emerald jump for Relyh 2015-10-26 23:42:52 -04:00
NewGarbo
c30ece9d8b Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS 2015-10-26 19:48:20 +00:00
Sarah
e3049fd22e performance update for Minions and reducing nuke particles. 2015-10-26 17:54:45 +01:00
NewGarbo
da058881f8 Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH) 
added alligators tooth particles & sound
added wind blade power feature
 2015-10-26 15:37:44 +00:00
NewGarbo
eb350a79c3 Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing. 2015-10-26 12:21:33 +00:00
AlexTheCoder
7770fa0284 - Added system to ensure banned players are removed from the network 2015-10-26 07:09:01 -04:00
NewGarbo
63406e9ce1 Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore. 2015-10-26 07:57:00 +00:00
NewGarbo
7eab57c5dd As per Chiss' request, made the gear ui go to next page when you choose an attribute. 2015-10-26 07:49:03 +00:00
AlexTheCoder
f5b4f28848 - Fixed achievements 
- Various balance patches/audio changes
 2015-10-26 00:25:33 -04:00
NewGarbo
cc2aae9726 Final touches to the gear gui, making it now completely finished. hooray! 2015-10-26 00:08:03 +00:00
fooify
cbe147d705 typo fix in legendary aura description 2015-10-25 12:32:27 -07:00
fooify
7024084ce3 Update achievement kit reference text 2015-10-25 11:29:06 -07:00
fooify
f0e4416644 Fixed tnt bug (SG) 2015-10-25 10:52:56 -07:00
fooify
bb806d6260 Merge remote-tracking branch 'origin/master' into foo 2015-10-25 10:10:06 -07:00
NewGarbo
327c129f46 Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}]) 2015-10-25 12:28:12 +00:00
AlexTheCoder
57da1d195a - Resolved randomly using java 8 in this one plugin 2015-10-24 20:50:47 -04:00
AlexTheCoder
08fd1b5790 - Fixed MPS Whitelist for usernames with non-lowercase characters 2015-10-24 20:49:09 -04:00
Shaun Bennett
556d5adcd9 Change /global to /globalpacket (fixes conflict with announcement command) 2015-10-24 17:46:25 -04:00
NewGarbo
1e4b3442fa Conflicts: 
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
 2015-10-24 20:45:39 +01:00
NewGarbo
63bc492f2c Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code. 2015-10-24 20:36:53 +01:00
Shaun Bennett
0d56eefd44 Titan/Rewards adjustments 2015-10-24 13:40:17 -04:00
Keir
394e501682 Merge branch 'master' into feature/report 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2015-10-24 17:50:26 +01:00
Keir
a9fedecc70 Make the ui more appealing and use existing gui system to handle it. 2015-10-24 17:10:50 +01:00
NewGarbo
089c4420b2 Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code. 2015-10-24 07:16:13 +01:00
Keir
29587b93f7 Implement initial report interface. 
Added getPlugin() method to CommandBase.
Changed mini-plugin name from "ReportPlugin" to "Report" to match the other mini-plugins.

This is very WIP, still a lot to be done.
 2015-10-24 03:41:03 +01:00
libraryaddict
e3c824c512 Fix minor skywars error 2015-10-24 13:32:55 +13:00
libraryaddict
4d2b359aad Fix wolf cub strike 2015-10-24 08:41:10 +13:00
libraryaddict
43cd0f86a9 Fix players unable to break blocks at spawn 2015-10-24 08:40:57 +13:00
libraryaddict
7f025ad029 Fix CustomExplosion 2015-10-24 08:40:43 +13:00
Shaun Bennett
40afcaf26b Global Packet Commands 2015-10-23 15:07:53 -04:00
NewGarbo
0c29805756 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-10-23 19:27:13 +01:00
NewGarbo
11b836da8b Added Join/Quit messages. 
Removed periods from attribute descriptions.
Fixed legendary item lore having incorrect formatting.
 2015-10-23 16:59:30 +01:00
libraryaddict
2eb8b3e234 Catch PacketHandler exceptions 2015-10-24 02:17:19 +13:00
libraryaddict
5ec4203fd9 More changes to disguise 2015-10-24 01:36:42 +13:00
libraryaddict
a450b828b7 Fix disguises custom name 2015-10-24 00:48:54 +13:00
libraryaddict
de9678a20f Modify Craftbukkit 2015-10-23 21:28:01 +13:00
AlexTheCoder
d51b23849a - Fixed bugs and added features 2015-10-23 03:24:01 -04:00
AlexTheCoder
f7dab72e8c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 03:23:35 -04:00
Cheese
af208da953 Merge branch 'alex-testrank' 2015-10-23 18:10:59 +11:00
Cheese
d9d0254e46 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-23 17:30:59 +11:00
Shaun Bennett
fd1638a572 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-23 02:17:57 -04:00
Shaun Bennett
5944b734be More war fixes - still needs tweaking 2015-10-23 02:17:47 -04:00
Shaun Bennett
e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
NewGarbo
4c381d41fe Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place. 2015-10-23 06:10:09 +01:00
NewGarbo
18d998fc04 Fixed colors cutting out in the middle of the message in task information, moar fireworks! 2015-10-23 05:56:53 +01:00
AlexTheCoder
9ceb4eee94 - Take will and QA's suggestion about making the gameplay modifier a proper feature 2015-10-23 00:48:31 -04:00
AlexTheCoder
1512d87f9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-23 00:28:32 -04:00
AlexTheCoder
91ddcdb149 - Testing setup 2015-10-23 00:25:38 -04:00
AlexTheCoder
5a94e33d5e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 00:24:52 -04:00
libraryaddict
aedf04b3e3 Fix renaming pet not opening proper window 2015-10-23 09:26:21 +13:00
libraryaddict
53aa1b655b Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix 2015-10-23 09:20:24 +13:00
libraryaddict
8cde506a2c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-23 05:25:36 +13:00
libraryaddict
ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
NewGarbo
825b519890 Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks." 
Removed unused imports, and other code cleanup stuff.

Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"
 2015-10-21 21:50:46 +01:00
William Burns
e6bec41ca8 Fix "code too large" error. 2015-10-21 20:29:44 +01:00
NewGarbo
bf406493e3 Fixed tutorial tasks that rely on territory entrances not working because formatting... 2015-10-21 20:14:35 +01:00
libraryaddict
3cd803cda0 Update patch files and cb 2015-10-22 08:07:10 +13:00
Shaun Bennett
00a689ea03 War work 2015-10-21 14:48:27 -04:00
NewGarbo
112f34c77f Fixed NullPointerException when clicking outside of inventory GUI. 2015-10-21 08:10:53 +01:00
libraryaddict
5c010af8c4 Add updatehealth packet 2015-10-21 19:56:52 +13:00
Jonathan Williams
c719d693dd Added delete benefit call for repository. 
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
 2015-10-21 01:15:09 -05:00
NewGarbo
a5df50de92 On going map tutorials started and finished. 2015-10-21 06:55:06 +01:00
NewGarbo
eb203131a7 Fixed import errors since I moved the getting started tutorial to a different package. 2015-10-21 06:19:23 +01:00
NewGarbo
bd5266251b Finalized the getting started tutorial. 
Added the last 5 tasks, and added a nice big ending (fireworks)

Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.
 2015-10-21 06:17:18 +01:00
NewGarbo
c6cf47ee4e I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops. 2015-10-21 04:36:47 +01:00
NewGarbo
227e9f7bfc Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work. 
CHANGES----

Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.

Coded in the functionality of 7 tasks, will do the rest now.
 2015-10-21 04:27:14 +01:00
Cheese
768ef4eb97 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-21 13:00:16 +11:00
Sarah
6860f013d0 Fixing some spelling typos chat filtering and the scoreboard. 2015-10-20 19:23:58 +02:00
libraryaddict
8ceb69513a Update patches and cb.jar 2015-10-21 05:05:27 +13:00
libraryaddict
07f032a5d2 Fix wither pet making sounds, fixed worldtime. 2015-10-21 04:22:31 +13:00
libraryaddict
ddd674e371 Packets implement Pcaket right 2015-10-20 17:19:46 +13:00
NewGarbo
a2278297de Created the base for tutorials, and created the getting started tutorial. 
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
 2015-10-19 17:16:48 +01:00
libraryaddict
b3caf7c2d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-20 04:38:12 +13:00
libraryaddict
5d671d3300 Fix borders 2015-10-20 04:37:42 +13:00
Jonathan Williams
3ef33bd9c5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 01:32:23 -05:00
Jonathan Williams
5e307da15a Fix for inventory failure. 2015-10-19 01:32:12 -05:00
Sarah
b7b99687c8 decreasing nuke animation 2015-10-19 01:34:48 +02:00
Shaun Bennett
6d7f15cd6d Fix hub time after light flicker 2015-10-18 18:52:16 -04:00
Cheese
c7a5be9570 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 09:03:46 +11:00
libraryaddict
55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Shaun Bennett
0a3f942575 Fix compile issue 2015-10-18 12:42:56 -04:00
Shaun Bennett
177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-10-18 12:35:31 -04:00
AlexTheCoder
0094fa31f0 - Accidentally edited classpath - oops 2015-10-18 06:17:44 -04:00
AlexTheCoder
547c8ca726 - Bugfixes 2015-10-18 06:14:54 -04:00
Jonathan Williams
9e7629b1fe Added 43k player chest benefit. 
Updated MOTD.
 2015-10-18 00:21:01 -05:00
AlexTheCoder
12319169a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
 2015-10-18 00:54:18 -04:00
Shaun Bennett
523378aae7 Clans War updates 2015-10-17 22:55:21 -04:00
Cheese
d901cfa12c buildies can join full 2015-10-18 10:54:34 +11:00
libraryaddict
6f91827d57 Vector to Vector3f, updated Maze to 1.8 2015-10-18 12:40:01 +13:00
libraryaddict
02bf202d52 1.8 update 2015-10-17 13:21:03 +13:00
Shaun Bennett
589c05f8c0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
 2015-10-16 14:25:31 -04:00
libraryaddict
3a0781b3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
 2015-10-17 00:10:32 +13:00
libraryaddict
14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
Cheese
41b6fdc74e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 21:47:35 +11:00
Cheese
32489388c6 removed bug fix that caused SG break 2015-10-16 21:47:22 +11:00
libraryaddict
f71cb80bd0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-10-16 22:26:07 +13:00
Jonathan Williams
172bd65c57 Monster Maze motd. 2015-10-16 04:22:54 -05:00
libraryaddict
70c76d976f More changes 2015-10-16 22:10:13 +13:00
Jonathan Williams
62b209fede Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 01:57:30 -05:00
Jonathan Williams
d00fa856f3 Fixed Pets so they work correctly. 
Also fixed legend benefits.
Fixed chest pet rewards.
 2015-10-16 01:57:19 -05:00
Cheese
016cea15f3 Merge branch 'Myst_HALLOWEEN' 2015-10-16 15:01:59 +11:00
Mysticate
b8eb924ffa Fixed timing out. Yay. I'm done. G'night 2015-10-16 00:00:08 -04:00
Cheese
577c67cacd Merge branch 'Myst_HALLOWEEN' 2015-10-16 14:18:35 +11:00
Mysticate
b15b81a7e2 Spacing 2015-10-15 23:09:23 -04:00
Mysticate
f0a22d5c36 Fixed hammer throw 2015-10-15 23:02:51 -04:00
Mysticate
f0e0d41c42 Fixed two things. 2015-10-15 22:23:49 -04:00
Cheese
6cc33fd6c6 Merge branch 'thanos-bug-fixes' 2015-10-16 12:53:43 +11:00
Mysticate
41511dce7b Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-15 21:19:24 -04:00
libraryaddict
3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
Sarah
cd4b3054fa Fixing "Armor Stand" 2015-10-15 20:25:35 +02:00
libraryaddict
4205dc6c25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
 2015-10-15 12:34:34 +13:00
Sarah
6f55a60de0 removing more 2 word words, adding not killable message at Firebomb. 2015-10-14 22:41:34 +02:00
Ty Sayers
98ec99cffc Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager. 2015-10-14 16:06:34 -04:00
Cheese
1c52bd4f64 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-14 14:34:51 +11:00
Cheese
86bad0be30 mods can check other players skills 2015-10-14 14:34:30 +11:00
Shaun Bennett
0df637b80a Run punishBot in main server thread 2015-10-13 22:56:14 -04:00
Shaun Bennett
f683e932ae Clans merge fixes 2015-10-13 22:24:15 -04:00
Mysticate
a049d7666f Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-13 22:14:19 -04:00
Cheese
45cd2a38e1 admins can botspam 2015-10-14 11:55:59 +11:00
Shaun Bennett
88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
Shaun Bennett
cb0d82174e Apply botspam to chat messages as well 2015-10-13 17:41:25 -04:00
Sarah
d925ae7f8d adding animation for Speed Boost, fixing mob item dropping. 2015-10-13 15:53:48 +02:00
Cheese
1842eae7f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 23:22:58 +11:00
Cheese
d105ea5d7e botspam addition 2015-10-13 23:19:48 +11:00
libraryaddict
58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
AlexTheCoder
e1d8b25e91 - Fix misc champs bugs 2015-10-13 01:24:57 -04:00
Jonathan Williams
a292fdb3c5 Added failsafe for ServerMonitor. 2015-10-12 22:26:24 -05:00
Cheese
f5b80c941c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 11:58:27 +11:00
Cheese
e8388437b6 botspam now checks for chat as well 2015-10-13 11:58:14 +11:00
Cheese
3e5ac58ae9 helpers! 2015-10-13 11:23:00 +11:00
Cheese
37639a413c fixed skill stuff 2015-10-13 11:22:10 +11:00
AlexTheCoder
0bd026f506 - Fixed merge issues 2015-10-12 18:04:35 -04:00
AlexTheCoder
f497eab633 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-10-12 17:54:11 -04:00
Mysticate
be96842de5 Ultra 2015-10-12 17:02:34 -04:00
Sarah
9010b8bfe9 removing some unneeded stuff and fixing tag overlaying 2015-10-12 22:01:23 +02:00
libraryaddict
cef52368a3 Hologram fixes 2015-10-13 08:59:13 +13:00
Sarah
e969e1adeb pushing for Lib to check because of Holograms, also editing spell names, removing 2 word words and editing the sniper spell. 2015-10-12 21:25:59 +02:00
Sarah
ff7ebeed57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-10-12 20:23:34 +02:00
AlexTheCoder
dceba51060 - Fix random blockhunt bug with mounts and infestor 2015-10-12 03:09:40 -04:00
AlexTheCoder
bbb863ba92 - Merge conflict patch 2015-10-12 02:36:10 -04:00
Cheese
2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Shaun Bennett
1aecc9505c Add region to titan, new MOTD 2015-10-12 01:30:31 -04:00
AlexTheCoder
bef942f6da Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-12 00:47:56 -04:00
Cheese
6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
libraryaddict
dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
 2015-10-12 16:22:52 +13:00
Mysticate
3eb36a6581 Prevented farming 2015-10-11 22:43:21 -04:00
Mysticate
2abf3edad4 Made items for titanic cosmetics dyes. 2015-10-11 22:29:26 -04:00
Mysticate
b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Mysticate
dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Mysticate
20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
 2015-10-11 10:52:45 -04:00
Mysticate
606937d227 Fixed flashbang glitch 2015-10-11 09:42:36 -04:00
Jonathan Williams
e6485a9009 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 23:02:36 -06:00
Jonathan Williams
5866e0cce6 Reducing max connections for the DBPool to 3. 2015-10-10 23:02:08 -06:00
Cheese
f23bf18928 adhering to mysts OCD 2015-10-11 14:50:57 +11:00
Cheese
f3e2f3c145 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-11 14:48:17 +11:00
Cheese
cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Mysticate
435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Mysticate
83d1e011fc Changes. 2015-10-10 23:33:54 -04:00
Jonathan Williams
998d5f6984 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 21:25:29 -06:00
Jonathan Williams
061a7b7c73 Fixed Pet FK errors. 
Added SUPPORT to acceptable updateRank command.
 2015-10-10 21:24:47 -06:00
Cheese
8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese
6860fa608a titan placeholder perks 
art
fixed pumpkin gem count
 2015-10-11 11:26:09 +11:00
Mysticate
72d943f51b Restored skills to pre-eula ultra 2015-10-10 16:20:28 -04:00
Mysticate
5a8e500ec0 Fixed another thing 2015-10-10 16:15:10 -04:00
Mysticate
5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Sarah
65b0d68244 adding more mobs and hiding enemy mob name tags. 2015-10-10 16:56:21 +02:00
Cheese
da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Cheese
323842c693 fixed mods staying in flight 2015-10-10 19:36:38 +11:00
Cheese
6f14c75f70 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 19:28:26 +11:00
Cheese
6cf786eb8c Merge branch 'Myst_HALLOWEEN' 2015-10-10 19:28:08 +11:00
Cheese
1026a2ae22 fixed explosions 2015-10-10 19:27:54 +11:00
Shaun Bennett
a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese
e9207acd7f Merge branch 'alex-halloween' 2015-10-10 17:38:09 +11:00
Cheese
7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
 2015-10-10 17:34:17 +11:00
AlexTheCoder
67a1f4ce8d Titan Giveaway: 
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
 2015-10-10 02:31:52 -04:00
Mysticate
930cfa5cb8 DONE 2015-10-10 02:30:11 -04:00
Shaun Bennett
f1e9acbb58 Titan giveaway 2015-10-10 02:19:05 -04:00
Mysticate
245a42c8e0 animation is sexi 2015-10-10 02:13:04 -04:00
Mysticate
30a9196430 Done with animation. 2015-10-10 01:43:31 -04:00
Mysticate
9a7357e484 Work 2015-10-10 01:00:49 -04:00
AlexTheCoder
88b4ac96e5 - Achievement stuff 2015-10-09 23:15:19 -04:00
Shaun Bennett
36fabf93b6 Merge remote-tracking branch 'origin/master' 2015-10-09 23:14:13 -04:00
Shaun Bennett
bc7bf8a2e2 fixes/debug 2015-10-09 23:13:39 -04:00
Jonathan Williams
512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Mysticate
1127764cc3 Secsi 2015-10-09 22:44:49 -04:00
Mysticate
7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
 2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Mysticate
90c685617d Animation 2015-10-09 22:14:01 -04:00
Peter Miller
611fb88f15 Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load). 2015-10-09 20:40:50 -04:00
Cheese
ed89f5f4cc anim example for myst 2015-10-10 10:46:12 +11:00
Cheese
43f38c18ee animation 2015-10-10 10:40:44 +11:00
Cheese
d99c64e45d fixed merge error 2015-10-10 10:37:20 +11:00
Cheese
02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
 2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00