21d10e4bec
Fix typo
2015-11-04 19:15:06 +13:00
b3f86ba638
Fixing bugs
2015-11-04 18:34:22 +13:00
8033b40011
made math in GearPage a tiny bit more understandable
2015-11-04 01:27:33 +00:00
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
a455804dce
some Tutorial code cleanup
2015-11-04 00:07:32 +00:00
4bf92ce0a0
gah why isn't this working?! git is annoying!!!
2015-11-03 23:47:35 +00:00
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
b7bf4765c4
DANG YOU WILLIAM
2015-11-03 22:05:17 +00:00
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
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
c25b1969de
More progress
2015-11-04 04:00:53 +13:00
f66c85d5b0
When clearing or getting items from player inventory, get it from player crafting as well
2015-11-03 18:57:41 +13:00
93ff7c32b5
Merge pull request #71 in MIN/mineplex from alex-bugfixes to master
...
* commit 'c518221f6b6d11da83b686445f54d702c35a3d3e':
- Fix Merge Error
- Fixed MPS Whitelist
- Resolved randomly using java 8 in this one plugin
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-11-02 23:22:21 -06:00
c518221f6b
- Fix Merge Error
2015-11-02 22:14:48 -05:00
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
89c9f19c69
- Fixed MPS Whitelist
2015-11-02 22:08:02 -05:00
975ad9e6ea
Update to master
2015-11-03 15:05:56 +13:00
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
7496ed763a
Fix wither and dead bodies bug
2015-11-03 14:41:34 +13:00
4794cc6924
Clans Gui
2015-11-02 20:41:08 -05:00
3f66e11b3d
Add fence to non-full-solids
2015-11-03 12:39:13 +13:00
8838ea75e4
Some code cleanup for tasks.
2015-11-02 09:37:11 -06:00
3b38302429
Optimized TaskManager task locks and calls.
...
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
27c6ef4e9d
Success! Finished all events woohoo!
2015-11-02 10:16:13 +00:00
0bc8413430
test
2015-11-02 10:11:54 +00:00
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
55d028d706
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-01 22:09:58 -06:00
3a0b8d75a2
Added new support member.
2015-11-01 22:09:50 -06:00
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
9cf62cfe7f
Don't use player skulls until caching is setup and working properly
2015-11-01 22:58:22 -05:00
cdb0fcae75
modified hideme a little :)
2015-11-02 14:37:12 +11:00
da6bf27c77
Staff with a higher rank can see lower rank and same ranked vanished staff.
2015-11-02 04:32:07 +01:00
cb96124feb
Added extra cleanup for FriendsGUI and AddFriendPage
2015-11-01 17:42:23 -06:00
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
5c2ade8270
Updated staff list.
2015-10-31 14:55:34 -05:00
f16eee220d
Removed Debug messages.
2015-10-31 14:55:18 -05:00
073321fb14
Refactored TrickOrTreat Stuff.
2015-10-31 14:45:42 -05:00
92a2c2ebaa
fixed npe in kit npc creation
2015-10-31 19:55:58 +11:00
b8b260bca1
fixed expire time on projectiles
2015-10-31 19:01:49 +11:00
c463b80fe0
fixed insta-expire
2015-10-31 19:00:28 +11:00
5d58c56c27
fixed kit bug
2015-10-31 18:31:13 +11:00
3636fdfba0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-31 18:23:06 +11:00
225f067ab3
fixed some projectile stuff
2015-10-31 18:22:53 +11:00
cd15df0238
Merge remote-tracking branch 'origin/master'
2015-10-31 02:13:24 -04:00
71e49854db
Add halloween hats
2015-10-31 02:10:15 -04:00
bce439d0cf
Merge pull request #70 in MIN/mineplex from Myst_TRICKORTREAT2 to master
...
* commit '1a6617bce1af68b0665323d59b956daf290ca91f':
Changes.
2015-10-31 01:07:55 -05:00
1a6617bce1
Changes.
2015-10-31 02:05:03 -04:00
519dceb72e
Doublejumping downwards is a no no
2015-10-31 19:02:58 +13:00
23be8aa1dd
removed unncessary stuff
...
balanced rewards
2015-10-31 14:33:41 +11:00
a92a52f009
Merge branch 'Myst_TRICKORTREAT'
2015-10-31 14:27:06 +11:00
libraryaddict
NewGarbo
libraryaddict
AlexTheCoder
Shaun Bennett
Jonathan Williams
Shaun Bennett
Cheese
Sarah
Mysticate