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

566 Commits

Author SHA1 Message Date
Cheese
1a5dbc073d recursive block find method 2015-11-26 14:47:01 +11:00
NewGarbo
11deec75dd fixed illusion 2015-11-26 00:44:13 +00:00
Shaun Bennett
1306137cb2 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
NewGarbo
9a8fba543d auto-replanting trees 2015-11-25 17:03:48 +00:00
NewGarbo
2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
xGamingDudex
84fde1c087 Fixed double jump and entity ground tool. 
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.

Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
 2015-11-25 16:42:32 +01:00
xGamingDudex
3b89d65a09 Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
 2015-11-25 15:59:18 +01:00
NewGarbo
459e1beeff clans buggy fixers 2015-11-24 22:18:48 +00:00
Cheese
4d128d9c7a fixed some skills and wierd hitbox error 2015-11-21 10:29:48 +11:00
AlexTheCoder
f51358552a -B 2015-11-20 05:57:29 -05:00
Sarah
ad280c96c9 adding interactive Chat elements. 2015-11-19 20:45:40 +01:00
NewGarbo
0a667afeb1 finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching 2015-11-18 22:27:01 +00:00
NewGarbo
eded09b1a9 fixed yet another bug with beds... argh it seems to be working fine now. 2015-11-18 21:02:39 +00:00
NewGarbo
6f3693f804 more bug fixes 2015-11-18 19:32:20 +00:00
NewGarbo
924504ac9f fixed clans home NPE. also added GRASS to UtilItem's item property system. 2015-11-18 19:03:44 +00:00
NewGarbo
9eaffc8acf Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on. 2015-11-18 12:17:00 +00:00
Shaun Bennett
4183f0ce07 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
 2015-11-17 18:05:17 -05:00
Shaun Bennett
f6cfc36e9f War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard 2015-11-17 17:59:35 -05:00
NewGarbo
31906b025f Clans Home switched over to using physical beds. 
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
 2015-11-17 22:24:19 +00:00
Shaun Bennett
07f92d2e6e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
 2015-11-16 14:39:47 -05:00
NewGarbo
fff248ad86 king of the hill gold drop fix 2015-11-15 20:37:37 +00:00
NewGarbo
5209cf3d38 fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself. 2015-11-15 20:04:44 +00:00
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
NewGarbo
e28059848c New 1.7 leaves fix for UtilBlock#getHighest() 2015-11-15 08:51:59 +00:00
Shaun Bennett
487f974951 Clan Gui updates and code cleanup 2015-11-13 23:53:34 -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
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
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
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
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
Jonathan Williams
27ef2c0bbb Fixed UtilEnt.Leash method. 2015-11-11 04:36:10 -06:00
Shaun Bennett
610b5dbeb2 More work on gui 2015-11-09 14:39:52 -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
Shaun Bennett
addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
libraryaddict
627ce08113 Add info on note particle 2015-11-07 21:35:26 +13: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
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
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
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
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
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
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
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
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
Cheese
b9d7c80f80 cow kit 2015-10-31 13:25:57 +11: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
ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +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
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
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
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
NewGarbo
cffcf245e9 UtilItem.java overhaul, complete item attribute system added. 2015-10-28 22:14:08 +00:00
libraryaddict
5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13: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
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
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
libraryaddict
ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +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
55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13: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
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
libraryaddict
14a524cf54 Stuff 2015-10-17 00:08:30 +13: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
libraryaddict
70c76d976f More changes 2015-10-16 22:10:13 +13:00
libraryaddict
3dda9352e7 Progress 2015-10-16 13:32:23 +13: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
Shaun Bennett
88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
libraryaddict
58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13: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
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
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
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
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
xGamingDudex
ba171f95c6 Fixed UtilEnt.isGrounded for non-player entities. 
Updated UtilEnt.isGrounded(Entity) to only apply custom handling of
players. Non-player entities now uses the default .isOnGround() check.
Implemented to fix entities like minecart which applies custom
is-on-ground checks.
 2015-10-09 14:42:38 +02:00
Cheese
99fd88473b rank colors 2015-10-09 14:20:02 +11:00
Mysticate
082b16fe0d Stuff and things to help make mounts be cool. 2015-10-08 22:28:07 -04:00
Cheese
ec5694737c statsmanager debug 
rank fix
 2015-10-09 11:44:12 +11:00
Cheese
3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
alexmack929
6c73b1a5ac Start moving i18n into master. 2015-10-04 15:24:58 +01:00
Ty Sayers
661bba3714 Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description. 2015-10-02 13:57:46 -04:00
Shaun Bennett
5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -04:00
Mysticate
68c6ba595e Visual enhancements. 2015-09-30 19:31:36 -04:00
Ty Sayers
b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-29 18:09:52 -04:00
Shaun Bennett
8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Mysticate
00eecc0325 Fixes 2015-09-28 20:33:38 -04:00
Mysticate
eea7ef8350 Swag 2015-09-27 02:11:28 -04:00
Mysticate
b2f1f7d2ae Fixed the tracker for pilot. 2015-09-25 11:38:32 -04:00
Christopher Jozsa
9a3ef895c9 Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
  player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground.
 2015-09-23 19:37:48 -05:00
AlexTheCoder
c709980db3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-09-23 13:08:25 -04:00
fooify
0581474a16 lots of work on Monster Maze 2015-09-18 08:25:11 -07:00
Cheese
d9142ac33f smash balance 2015-09-14 12:34:55 +10:00
fooify
2de7fff267 Merge remote-tracking branch 'origin/master' into monster-maze 2015-09-13 08:45:34 -07:00
Cheese
c9971bb117 fixed duplicate rank name 2015-09-12 16:45:22 +10:00
Cheese
4184fe20cf minor fixes 2015-09-12 14:09:04 +10:00
Cheese
a4cc70c3f0 new small youtuber rank 2015-09-10 13:17:11 +10:00
Ty Sayers
15b51fe575 Fix bug where Fissure skill travelled through doorways as well as increase cooldown. Fix bug where Cobwebs could be thrown inside spawn safe zones and increase cooldown. Modify StaticLazer skill's range, damage, cooldown, and damage radius for balance purposes. Remove the ability to craft TNT Minecarts and Jukeboxes. Disable fishing ability in Clans. Add the requirement that players must crouch while clicking on furnaces to be able to smelt. Fix bug where Axes weren't considered a weapon in the context of player murders. 2015-09-07 20:39:34 -05:00
Cheese
03537e4650 fixed a spacing issue 2015-09-04 12:18:02 +10:00
Cheese
0ec3a8dc10 added radar for ctf and dom 2015-09-04 12:09:26 +10:00
Shaun Bennett
5d77202370 Add SrMod to blacklist, prevent armor from breaking when hitting people with it, stop firing block toss event if you cant use block toss 2015-08-30 12:41:15 -07:00
Mini-Chiss
05ecfb8ff0 snake workin! 2015-08-29 16:33:35 -07:00
Ty Sayers
227a077dba Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
 2015-08-29 15:53:42 -07:00
Shaun Bennett
4aee4f8fd7 Fix generators 2015-08-29 15:09:02 -07:00
Ty Sayers
aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Mini-Chiss
eb6a0c9e38 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-29 14:27:54 -07:00
Mini-Chiss
efd435396f snake 2015-08-29 14:27:40 -07:00
Shaun Bennett
16d807db2e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-29 14:01:45 -07:00
Shaun Bennett
fae27df496 Add ClansLoginManager, TNT Generators (Still needs persistence) 2015-08-29 13:35:31 -07:00
libraryaddict
e7f861a6c2 Push golem changes, snakes code and rename bossability thingy 2015-08-29 12:04:53 -07:00
Mysticate
ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Ty Sayers
825dd66283 Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones. 2015-08-28 14:17:11 -07:00
Jonathan Williams
e9b33668bc Added donorsOnline to MinecraftServer snapshot 
Refactored Rank class to use lowercase methods.
 2015-08-28 13:22:04 -07:00
libraryaddict
249ecdd381 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-28 11:42:53 -07:00
libraryaddict
1f5cd624a4 Fix up iron golem, add slam attack 2015-08-28 11:42:33 -07:00
Ty Sayers
783f526b76 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 14:42:41 -07:00
Ty Sayers
4dcd54a9b0 Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans. 2015-08-27 14:42:07 -07:00
libraryaddict
379ee9271a Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta 
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
  Iron Wizard, fixed iron golem custom name
  Push golem block shot as per request
 2015-08-27 16:34:46 -05:00
libraryaddict
102fcd8e73 Push golem block shot as per request 2015-08-27 11:10:17 -07:00
Shaun Bennett
adfc451e9f You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift 2015-08-27 09:33:44 -07:00
Ty Sayers
9a45d1116a Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones. 2015-08-26 12:22:36 -07:00
Ty Sayers
69afefd66f Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java

Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
 2015-08-24 20:55:29 -04:00
Mysticate
7b42f2155d Tweaks. :D 2015-08-24 20:40:34 -04:00
libraryaddict
8798244351 Bosses stuff 2015-08-24 08:34:29 +12:00
Ty Sayers
a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-08-22 15:18:51 -04:00
Ty Sayers
6c9a99fa1b Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning. 2015-08-22 15:06:05 -04:00
Mysticate
cbaaee60d9 Removed mob spectating method from evolving. 2015-08-21 13:00:08 -04:00
libraryaddict
39ede2064a Bosses game progress 2015-08-21 16:12:26 +12:00
Mini-Chiss
63107b0c26 missing file 2015-08-20 20:39:20 +02:00
Mini-Chiss
15c873392a updated give to allow naming of items. 2015-08-20 20:38:07 +02:00
xGamingDudex
633cbdabe2 player.isOnGround() is controlled by packets from the player, meaning 
players can easily fake being on the ground resulting in infinite double
jumps. player.getFallDisance() is also reset when isOnGround() returns
true, meaning we'll need to manually check if the player is on the
ground.

Outlines two opposite corners of the entities bounding box, scann all
blocks inside, check if any of them are solid and return respectively.
 2015-08-20 15:42:39 +02:00
fooify
859a7e07d5 added the optional functionality 
to include air blocks in the util
method getInBoundingBox()
 2015-08-18 16:46:20 -07:00
Mysticate
2659dd4e39 Fixed minor bugs. Head now follows mob altitude. 2015-08-14 23:17:56 -04:00
libraryaddict
81f793d693 Iron Wizard: Commit progress 2015-08-14 20:49:17 +12:00
libraryaddict
a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-08-14 19:44:56 +12:00
libraryaddict
7fb85f24d1 UtilEnt: Change CreatureLook to support LivingEntity, not just Creature 2015-08-14 19:15:35 +12:00
libraryaddict
33a6e4cb13 UtilEnt: Add CreatureLook method 2015-08-14 19:12:05 +12:00
Mysticate
0c3c9702d9 Small fixes. 
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
 2015-08-12 09:44:55 -04:00
Mysticate
bd414cd231 Merge remote-tracking branch 'origin/master' into Myst_EVO 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
 2015-08-10 19:47:53 -04:00
Mysticate
e81a3f7ecd Added a method to UtilAlg. 2015-08-10 14:32:49 -04:00