Commit Graph

279 Commits

Author SHA1 Message Date
Cheese 420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
libraryaddict bead4a7626 No longer need to constantly set the durability of items in the sheep game 2015-03-15 13:13:06 +13:00
libraryaddict 18094fea9b Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...) 2015-03-15 12:32:59 +13:00
libraryaddict 503106892d Fixed UtilTime for displaying decimals when trimmed 2015-03-15 12:32:42 +13:00
libraryaddict e1c284722e Add method getEntityById to UtilEnt 2015-03-15 12:28:17 +13:00
Cheese 3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Cheese 8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11:00
Jonathan Williams 17543910b5 Added Chest packages to support server.
Fixed Punish not loading.
2015-02-14 15:09:42 -08:00
Mini-Chiss 26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Shaun Bennett ed8638ae9f Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it 2015-02-06 23:39:22 -05:00
Chiss 79cde8f5cf fixed util textbottom for 1.8.2 2015-02-05 21:39:42 +11:00
libraryaddict 505dcc1e8e Add friends gui, deprecate the old chatbased friends display 2015-01-30 13:46:07 +13:00
Chiss f80e640d34 Map Parser voxel update
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
libraryaddict 92ef0af39d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
Jonathan Williams b92226a771 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-23 00:55:36 -08:00
libraryaddict c5b444ae6e Wizards push 2015-01-23 21:52:03 +13:00
Jonathan Williams 73866669b8 Added RestartCommand and SuicideCommand
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.

Fixed issue with new servers getting cleaned up as excess as soon as they started.
2015-01-22 23:19:40 -08:00
Shaun Bennett a1f2a3a2a1 Clan Energy 2015-01-22 20:34:44 -05:00
libraryaddict fa47f33407 *cough* fixes to UtilTime *cough* 2015-01-23 02:31:00 +13:00
libraryaddict 94607585a3 Fixed UtilTime being bugged 2015-01-21 19:00:39 +13:00
libraryaddict dd2418232c Wizards progress 2015-01-21 19:00:07 +13:00
libraryaddict 52d83587cd Fix dragon bossbar not being halved 2015-01-18 21:23:50 +13:00
libraryaddict ea452d8fa5 Wizards progress 2015-01-18 21:23:48 +13:00
libraryaddict a42cfed226 Add a comment on what each of the block hashsets do in UtilBlock to make it easier to use without struggling to remember 2015-01-18 21:23:46 +13:00
libraryaddict 0ad4034f96 The beginnings of a api to calculate shapes; mainly for particle use 2015-01-18 21:23:46 +13:00
libraryaddict d6b5439eb5 Initilize the static byte HashSet's in UtilBlock not when you try to compare a block, but on class load 2015-01-18 21:23:45 +13:00
libraryaddict b40393af10 Modify UtilPlayer to get the entity someone is looking at 2015-01-18 21:23:45 +13:00
libraryaddict 34ce818614 Stupid else ifs 2015-01-18 21:23:03 +13:00
libraryaddict a64e082f2c Only add a 's' to UtilTime's convertString if the number in the string is not a 1 2015-01-18 21:23:03 +13:00
Jonathan Williams 97f57b655b Prevent horses from spawning in Clans
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Chiss f961fd0233 Merge remote-tracking branch 'remotes/origin/searchanddestroy'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
Chiss 56d14b7bc0 Particle stuff 2014-12-18 12:45:45 +11:00
Chiss a433ad764d Wither Morph
Legend Particle
2014-12-16 16:18:09 +11:00
libraryaddict 6d7a71d043 Modifications for SnD test 2014-12-16 15:14:07 +13:00
Chiss 4fd6ed80c4 final xmas Updates
xmas hub
2014-12-12 19:44:04 +11:00
libraryaddict 9a16616e6c Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas 2014-12-12 12:40:23 +13:00
Jonathan Williams c4fee8e681 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
Jonathan Williams ea034812b9 Fixed path finder crap in UtilEnt
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
Chiss 828fabb80a Initial Christmas Chaos update 2014-12-09 20:04:59 +11:00
Shaun Bennett 7402eb2f91 Merge remote-tracking branch 'origin/master' 2014-12-06 01:00:40 -06:00
Jonathan Williams 3d3f9012ff Added some base Clans shops.
Added support for Gold

Refactored failed db call code a bit.
2014-12-04 23:41:49 -08:00
Shaun Bennett 03bd2ed2c1 Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text 2014-12-04 17:48:06 -06:00
Jonathan Williams 59f93d46ec Refactored IButton
Added ComplexButton

Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
2014-12-04 05:05:27 -08:00
libraryaddict 0813f0a914 Instead of having a internal entityId. Use mojang's entityid's but add one everytime you want it. Also allow fetching of the next entityid to be used 2014-11-30 15:41:57 +13:00
Jonathan Williams 4b2998793c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-28 14:16:07 -08:00
Chiss b3beadf8b5 made recharge look nicer for 1.7
added missing files
2014-11-29 09:14:33 +11:00
Jonathan Williams 515176b63f Clans to buildable state. 2014-11-27 22:34:20 -08:00
Chiss 19d3bba461 fixed fence glitch in dom 2014-11-22 13:20:34 +11:00
Jonathan Williams ab78b4b89d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-19 22:25:17 -08:00
Jonathan Williams 1a6b80b08e More work on clans..
Finished ClansDataAccessLayer
Finished ClansAdmin
Finished ClansDisplay
2014-11-19 22:24:36 -08:00
Chiss 4961b55986 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-18 16:43:53 +11:00
Chiss f5022ecf16 Fixed dupe glitch (all games)
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
2014-11-18 16:43:39 +11:00
Shaun Bennett f071d2e727 Fix for TNT explosion in Bridges 2014-11-17 18:09:58 -06:00
Chiss 51bc53262d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-15 19:32:08 +11:00
Chiss ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Shaun Bennett 521b1e5f3b Merge remote-tracking branch 'origin/master' 2014-11-13 21:54:15 -06:00
Chiss 8ab0116a27 initial push of Wither Assault 2014-11-14 14:14:31 +11:00
Shaun Bennett 8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss f6df7705b1 - Added 3 kits for DMT
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
2014-11-04 19:17:06 +11:00
Chiss cfcfad610f Improved recruit/prepare countdown timers 2014-10-25 13:56:23 +11:00
Chiss 4002528c51 Updated GUI text.
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
Chiss 7dbba0a1f9 Added teleport for map parser
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
2014-10-25 11:17:32 +11:00
Chiss 92d9fc4ca0 Deleted deprecated firework module and converted to Util 2014-10-25 11:03:45 +11:00
Chiss b47dcf12af remvoed debug rank 2014-10-23 14:06:06 +11:00
Chiss c2bb53c887 Halloween pumpkins
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
Shaun Bennett ec81e9f511 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-10-16 17:51:32 -05:00
Chiss 5db2c072a0 Halloween update 2014-10-16 16:27:09 +11:00
Shaun Bennett 58f69b49d7 Add new chat features to JsonMessage 2014-10-15 11:11:32 -05:00
Chiss eb5af41323 Added halloween reward pet
minor bug fixes
2014-10-15 15:44:26 +11:00
Chiss e2c72a3ae2 HH update 2014-10-11 14:28:00 +11:00
Chiss d0d2622ecc added UHC on-the-fly anti-xray 2014-10-10 18:54:38 +11:00
Chiss 8701f9ddcc Added TabTitle
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11:00
Chiss 17e34e2060 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-03 10:49:42 +10:00
Chiss 31ceaad7fe MineStrike audio update 2014-10-03 10:49:26 +10:00
Jonathan Williams d32085f05b Removed tab list stuff for friends.
Implemented rudimentary friends chat list.
removed unused code in server stuff.
Added null check for retrieving server statuses.
2014-09-24 01:31:56 -07:00
Shaun Bennett 51ad6d8368 Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes 2014-09-18 17:33:05 -05:00
Chiss fed3d31374 MineStrike fixes 2014-09-18 15:44:48 +10:00
Chiss 7e3b9b4b3a some 1.8 title stuff 2014-09-14 14:10:40 +10:00
Shaun Bennett dea6c98fc9 Merge remote-tracking branch 'origin/master' 2014-09-12 14:08:22 -05:00
Shaun Bennett 4ea786a1a5 Fix fireworks for 1.8 client, a bunch more treasure stuff 2014-09-12 14:08:10 -05:00
Chiss b5152bd621 removed some redundant repeated color stuff 2014-09-12 11:59:32 +10:00
Chiss 0dff0412d1 Fixed game flag for not allowing inventory opens
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
2014-09-12 11:47:39 +10:00
Chiss 2791d54040 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-11 13:43:34 +10:00
Chiss 56263718d7 Fix for BossBar 2014-09-11 13:17:57 +10:00
Shaun Bennett b910c5098c Cross version Holograms (Alignment might be a tad off)
A bunch of stuff for Treasure Chests
2014-09-10 12:16:31 -05:00
Shaun Bennett eb27c1dfbe Add Util class for sending titles to players 2014-09-05 19:46:11 -05:00
Jonathan Williams 2f8b53f771 Fix for customer support server.
Fix for Boss bar junk.
Fix for Disguises.
2014-09-05 14:36:10 -07:00
Jonathan Williams d01529a344 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-09-05 04:38:23 -07:00
Jonathan Williams 1c6790b611 Fixed for DisguiseManager
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
2014-09-05 04:36:01 -07:00
Chiss 8c1e0c3e9e Fletcher data fix
Minestrike stuff
2014-09-05 15:45:14 +10:00
Jonathan Williams b28fc8ee6b Added custom name tag fix for mobs for 1.8 players
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
Shaun Bennett e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams 92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
Jonathan Williams a4871b5509 Updated to latest spigot with 1.8 support.
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Chiss 50140ef92d Minestrike update 2014-09-03 14:49:38 +10:00
Chiss 449281501f MineStrike Update 2014-09-02 16:49:15 +10:00
Chiss 207de0e67a fixed MAC kicking players on lillypads 2014-08-30 20:49:32 +10:00
Jonathan Williams b07670f6af Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:04:32 -07:00
Jonathan Williams 1bd0209b39 Added multi-server tags for npcs
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
Chiss c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00