Commit Graph

995 Commits

Author SHA1 Message Date
Chiss ca34ac4e02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-29 09:09:23 +11:00
Jonathan Williams 92ea94c3be Fixed creating clan delay in clans/ClientClan.java
Added logging for Mineplexer startup.
Fixed return generated keys in RepoBase
2014-11-28 14:06:41 -08:00
libraryaddict e56970a212 Let ShopItem no longer extend CraftItemStack and instead extend ItemStack to remain useful to other plugins and use ItemMeta 2014-11-29 07:21:37 +13:00
Jonathan Williams 62a172e01b Removed all the UUIDFetcher calls. 2014-11-27 22:34:05 -08:00
Chiss 8f9f88987b mods can no longer use /tp Here
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
Chiss fdc67e021c Staff using /tp commands will take them out of the game (Mod to Admin only)
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
libraryaddict d5d9e2eb14 Don't bother with these checks in ItemLayout 2014-11-28 09:30:57 +13:00
libraryaddict 8d12b8e565 Check item has Lore before trying to use it 2014-11-28 09:30:27 +13:00
libraryaddict d1b6aee802 Change ItemLayout to allow repeats of item arrays 2014-11-27 14:34:34 +13:00
libraryaddict bd8ca593e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy 2014-11-27 08:06:13 +13:00
libraryaddict ac0c024b1b Use nmsPlayer.m() instead. This sets both the container to default and tells the open inventory to close. Which fixes any normal blocks like DoubleChest from remaining visually open to others. 2014-11-27 07:16:59 +13:00
libraryaddict 86fe7344c7 When another inventory is opened with a previous inventory already open, this fixes the cursor position from being reset to the center of the screen. For those interested. Its basically denying the inventory close packet from being sent. 2014-11-27 06:56:19 +13:00
libraryaddict 34e320dfee Create untested ItemLayouts for your customized layouts of your items.
If you look to your right (ComplexItemLayout) you can define layouts such as "XX(de)XX(fg)XX" then call to replace all occurances of the letter d with this item. The (de) will then be set to that item.
2014-11-27 06:03:28 +13:00
libraryaddict b160822260 Add follow entity to holograms 2014-11-27 03:17:59 +13:00
libraryaddict f5533dbce2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy 2014-11-27 01:13:14 +13:00
libraryaddict c76ad50136 Allow removal of packet handler 2014-11-27 01:08:42 +13:00
libraryaddict 84b56708f9 Added new class ItemBuilder for chain building ItemStacks 2014-11-27 01:08:38 +13:00
libraryaddict 9928811a71 Merge pull request #2 from Better-Holograms to master
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
  Remove the 'Made by Shaun'
  Fix up mistakes in the previous modifications
  You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
  Ignore wither skulls for CustomTagFix
  Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
libraryaddict ef59cb7a9d Merging changes from master to Better-Holograms
* master:
  Antistack replacement

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
libraryaddict 30e2de6f22 Remove the 'Made by Shaun' 2014-11-27 00:50:02 +13:00
Jonathan Williams 00e372820b Fixed UI update when purchasing items. 2014-11-26 02:13:19 -08:00
Jonathan Williams 2afe84d7c7 Fixed stupid query thing....defek7.
Removed extra logging.
2014-11-26 00:59:10 -08:00
libraryaddict 3ad3fb21ff Fix up mistakes in the previous modifications 2014-11-26 21:35:45 +13:00
Jonathan Williams f39e3dcec7 Fixed traversing resultSets. 2014-11-26 00:08:51 -08:00
Jonathan Williams 06526d1e96 Fixed sql bug in FriendRepository
move/cleanup in RepoBase
2014-11-25 21:45:34 -08:00
Jonathan Williams 15d129d184 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java
2014-11-25 21:18:12 -08:00
Jonathan Williams 909877c869 Wiggle left, wiggle right, hope this works. 2014-11-25 21:17:30 -08:00
Chiss 4ccb242066 i added a space! 2014-11-26 16:02:11 +11:00
libraryaddict 03075fecae You have your HologramManager presented in a light most fair.
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
Jonathan Williams 484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Jonathan Williams 3b54789767 Optimized logins dealing with mysql with multiqueries.
Added lazy loading of Pool data and Loaded check before performing anything.

Refactored MiniClientPlugin and created MiniDbClientPlugin

Renamed RankBenefitManager9000 to BenefitManager

Removed /send ability for now.
2014-11-25 13:25:13 -08:00
libraryaddict 3c76fde190 Ignore wither skulls for CustomTagFix 2014-11-26 09:51:08 +13:00
libraryaddict 141c08ceb8 Remove old holograms and add new holograms 2014-11-26 09:18:36 +13:00
Shaun Bennett f1fbc21570 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
Shaun Bennett c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Chiss 2871446f74 reduced max amount of blocks from explosions 2014-11-23 15:01:04 +11:00
Jonathan Williams 37b5e495b8 Update local cache of inventory and if fail, revert change.
Removed full lock on login.

Removed Thanskgiving benefit.
2014-11-22 17:52:22 -08:00
Jonathan Williams d1578b12d4 Removed extra console logging. 2014-11-21 14:45:55 -08:00
Jonathan Williams 7bd12ab850 Re-did benefits and inventory to only update locally if db succeeeds......DOH 2014-11-21 14:41:25 -08:00
Jonathan Williams 29204de987 Removed old benefits.
Added youtube rank application from Owner

Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken
2014-11-20 21:58:39 -08:00
Jonathan Williams 2446e6d64d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-20 21:42:40 -08:00
Jonathan Williams 1f5be77880 Fixed text in Dom shop.
Cleaned up some code in benefit stuff.
2014-11-20 21:42:33 -08:00
Chiss f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11:00
Jonathan Williams 6c63552480 Refactored RankBenefitsGiver9000
Added Thanksgiving benefits (1 treasure key).

ServerMonitor now ignores Testing group.
2014-11-20 21:24:23 -08:00
Chiss 7a8759dfba updated disguisemanager so it uses player arg
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +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 828b866fc1 Added functionality to RepositoryBase to return generated keys.
Prevent invalid UUID from jacking up web call in Enjin listener.
2014-11-19 22:23:42 -08:00
Chiss 450cc9ada2 Champions achievement update
Wither update
2014-11-20 17:21:22 +11:00
Shaun Bennett e99a3f6544 Merge remote-tracking branch 'origin/master' 2014-11-17 18:19:06 -06:00
Shaun Bennett f071d2e727 Fix for TNT explosion in Bridges 2014-11-17 18:09:58 -06:00
Jonathan Williams 13ba32f2f4 Added command queueing for failed commands in EnjinTranslator.
Added verification of coin/gem application in Web api.

Added code to support polling last 100 purchases with EnjinTranslator

Added UUId lookup to CoreClientManager and fixed Async to Async calls with DatabaseRunnable.
2014-11-17 14:06:38 -08:00
Jonathan Williams 857ff29461 Removed buggy player disguises.
Removed datavalues from wither disguise.
2014-11-15 03:21:48 -08:00
Jonathan Williams 48c522a86b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 03:03:52 -08:00
Chiss 8d6793060c made early levels a little easier to progress through 2014-11-15 21:33:28 +11:00
Jonathan Williams 2af66c99e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 01:17:21 -08:00
Jonathan Williams df76f6be10 More work on Clans. 2014-11-15 01:13:14 -08:00
Jonathan Williams 685a2899ca Added custom name to wither disguise. 2014-11-15 01:12:58 -08: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
Jonathan Williams 2cf76ae5b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-13 19:15:05 -08:00
Jonathan Williams 4812da2cd9 More work on Clans - Clan repository. 2014-11-13 19:14:56 -08:00
Jonathan Williams 62fbeeda20 Added Wither disguise. 2014-11-13 19:14:14 -08:00
Shaun Bennett af31f4cd42 Add Tab handling for MultiCommandBase and "game set" command 2014-11-13 18:22:00 -06:00
Shaun Bennett 48c09aa311 Making spectator gui look better 2014-11-13 18:05:28 -06:00
Shaun Bennett eb4b451e12 Fixing some spectator gui bugs 2014-11-13 16:41:42 -06:00
Chiss 9eaacd20ab fixed slime healing
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
Chiss c5a873ffab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 14:40:26 +11:00
Chiss f9f7a834c2 geno morf 2014-11-13 14:38:33 +11:00
Jonathan Williams 7cad40044a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams 1372f74921 Refactored some names in MiniPlugin
Work on clans.
2014-11-12 19:21:12 -08:00
Jonathan Williams 0193c397fb Added Kit unlocks to staff server
Added password persistence in db.
2014-11-12 19:20:41 -08:00
Jonathan Williams 2e848c2ac2 Fixed some of twiggy conflicts. 2014-11-12 05:13:58 -08:00
Jonathan Williams 8d62966abc Created Clans project.
Converted Fields code complete (not tested).
2014-11-12 05:13:16 -08:00
Chiss 71a93bead5 Updated punish to be even less confuse. 2014-11-12 09:49:03 +11:00
Chiss d7141e4943 Added warning note to punish 2014-11-11 20:02:35 +11:00
Chiss f7ad986503 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-11 19:05:58 +11:00
Shaun Bennett c0f2f8a88c Remove useless comment/import 2014-11-11 01:47:03 -06:00
Shaun Bennett 23ab9756dc Merge remote-tracking branch 'origin/master' 2014-11-11 01:32:55 -06:00
Jonathan Williams b08cd54666 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-10 23:31:38 -08:00
Jonathan Williams 827fef535f Some commented out testing code in DisguiseManager 2014-11-10 23:30:41 -08:00
Jonathan Williams 108421164c Added support for stats with spaces in them for GiveStat. 2014-11-10 23:30:16 -08:00
Shaun Bennett 5b9b7347c6 Add tab complete processing for commands 2014-11-10 23:49:35 -06:00
Chiss 6c6c51e950 fixed compilation problems 2014-11-11 14:28:35 +11:00
MrTwiggy e3c50bfb39 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java
2014-11-10 18:55:57 -05:00
MrTwiggy 920bdad64c Player report system commit, including functionality for long-form MySQL storage of report logs as well as real-time redis based report sessions. 2014-11-10 18:44:46 -05:00
Chiss d362fb3b1c fixed punish error 2014-11-10 19:15:56 +11:00
Chiss 0252db5a05 Punish simplification update 2014-11-10 18:40:39 +11:00
Chiss d5515d11b2 fixed kick reason for bans 2014-11-09 14:27:01 +11:00
Chiss 6405253b1c added word wrap on punish text in GUI
only staff+punishee will now see punishments
2014-11-09 14:09:30 +11:00
Chiss 3c39e3d93a changed sev2/3 hack punishements
updated ban kick/login messages
2014-11-09 13:47:25 +11:00
Chiss a1f7fc5187 warnings are now friendly :)
reach hack detection base
2014-11-09 12:22:55 +11:00
Jonathan Williams 2781bb3000 Removed stacking buffers. 2014-11-08 14:32:37 -08:00
Jonathan Williams f03fe663f6 Simplified Lobby balancer code to randomize server selection on best 10 servers.
Increased rate at which bungee retrieves server information.

Increased rate at with servers sends server information.
2014-11-07 22:04:51 -08:00
CoderTim 4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
CoderTim 96f54c2949 Made DBPool class uninstantiatable 2014-11-07 18:27:20 -05:00
Chiss 24725eb22e play a sound when you get punished 2014-11-08 10:15:46 +11:00
Chiss 44fbd9fdd2 updated punishment output.
punishee is now informed of the reason in chat.
2014-11-08 10:11:12 +11:00
Chiss 3a3c2002f5 fixed level exp requirements 2014-11-08 09:17:59 +11:00
Chiss c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Jonathan Williams 3309c0406b Added ∞ for admin/owners as player level.
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
2014-11-07 13:54:11 -08:00
Chiss c93862f299 updated player level
added /givestat command for owners (must use full string; Global.ExpEarned)
2014-11-07 22:10:41 +11:00
Jonathan Williams f0099368d0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 01:27:16 -08:00
Jonathan Williams 264df5af79 Fixed load time issue with ServerConfiguration. 2014-11-07 01:27:07 -08:00
Chiss c245f84593 increased exp per level in mineplex level achievemnet 2014-11-07 20:10:15 +11:00
Chiss fadaa59526 added mineplex level
removed ability to go into negative gems as villager morph
2014-11-07 19:20:15 +11:00
Chiss 6ded835ba4 MAC will no longer false positive on people standing blocks from block morph. 2014-11-07 14:14:43 +11:00
Chiss 4c675cca9c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-07 11:54:14 +11:00
Chiss 91e0b42de8 Added start of MPS stuff
Some new gadgets
2014-11-07 11:52:58 +11:00
Jonathan Williams f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams 6f2a6a6ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-05 14:45:54 -08:00
Jonathan Williams 44ccd452a3 Added ServerConfiguration.
Added support to enable whitelist, alter max players and pvp value.
2014-11-05 14:44:56 -08:00
Jonathan Williams 4722062a36 Friend:
Prevent display of staff servers to non-staff.
Prevent display of CUST servers from everyone.
2014-11-05 14:44:25 -08:00
Jonathan Williams 4254225462 CoinBombs and GemBombs now queue their amounts to prevent excessive database calls.
Removed excess account row information retrieval on web api when awarding gems/coins.
Added account specific transactional locks in webapi.
2014-11-05 14:42:11 -08:00
Jonathan Williams 1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Chiss a66c3486d3 fixed bug in foot particle. 2014-11-05 11:35:52 +11:00
Chiss b00fb0952a Updated Sheep Quest to be 1.8 comptible.
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
2014-11-05 11:26:39 +11:00
Chiss 3a6968a60b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-04 19:17:21 +11: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
Shaun Bennett 174b1f43c4 GiveItem Fixes 2014-11-03 18:24:56 -06:00
Shaun Bennett 50ea13910a Change GiveItem command to Dev+ 2014-11-03 10:26:08 -06:00
Jonathan Williams 30a1df1473 Fix for null pointer in particle foot. 2014-11-01 02:38:59 -07:00
Jonathan Williams d64e8c5162 Added max of 10 connections for db pool. 2014-11-01 02:35:36 -07:00
Jonathan Williams 86fb78e34c minor Unused code cleanup 2014-10-31 23:32:59 -07:00
Jonathan Williams fa0049d22a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-31 23:01:15 -07:00
Jonathan Williams f206441999 Fix partial commit. 2014-10-31 23:00:53 -07:00
Jonathan Williams c85ba72730 Added null check for dragooon.
Added two treasure keys for halloween give away.
2014-10-31 23:00:13 -07:00
CoderTim f3770933b6 Merge branch 'feature/database-pool' 2014-11-01 01:59:07 -04:00
Chiss 0095a03df7 returned bridges to normal 2014-11-01 11:11:35 +11:00
Chiss 83d182db2e Fixed Villager exploit! oops
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss b5ef46007f updated npc info 2014-10-31 18:17:12 +11:00
Chiss de08456093 fixed error in block restore 2014-10-31 10:47:18 +11:00
Chiss aca18bb2e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-31 10:36:06 +11:00
Chiss aa45f031ac 3 new achievement Kits
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
CoderTim cc8912b27e Added NPC info messages to NpcManager 2014-10-30 18:20:21 -04:00
CoderTim 50a457ba51 Database pool tweaks 2014-10-29 19:13:28 -04:00
CoderTim 4fc291ea80 Everything but Mineplexer using database pool 2014-10-29 18:43:21 -04:00
CoderTim 5244f65d8f All connections to db.mineplex.com/Account use database pool 2014-10-29 17:54:40 -04:00
Shaun Bennett 9819b6c10a Merge remote-tracking branch 'origin/master' 2014-10-27 20:25:47 -05:00
Shaun Bennett 054c26dfbc New Coin/Gem Command 2014-10-27 19:59:30 -05:00
Shaun Bennett 01d44cd250 Give Item Command 2014-10-27 19:25:59 -05:00
CoderTim f0ba562265 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-27 18:11:29 -04:00
CoderTim 9f8b119fb7 Bug fixes 2014-10-27 18:09:23 -04:00
Jonathan Williams 006e20bb13 Prevent more than 5 players from being processed at a time on server connect. 2014-10-27 04:35:05 -07:00
Jonathan Williams e926fc1f10 Fixed TransferCommand 2014-10-27 04:34:35 -07:00
CoderTim a1c4b8840f NpcManager no longer uses database connection pool 2014-10-25 16:51:58 -04:00
Chiss 849d5f1471 lowered gem rewards for MS a little 2014-10-25 18:37:18 +11:00
Chiss bd2e7faf3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-25 13:40:53 +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
Shaun Bennett 5cf3e6c3a1 Fix for arcade custom tags 2014-10-24 19:36:22 -05:00
Chiss 25fc3c0645 Achievement Kits (3 games)
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
Jonathan Williams 27dc9f7693 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-23 23:58:24 -07:00
Jonathan Williams d4900c38b1 Halloween server max.
CustomTagFix fix for invis armor stand on your own head.
2014-10-23 23:58:13 -07:00
CoderTim f52a89d2ca NpcManager teleports slimes correctly 2014-10-20 18:19:19 -04:00
CoderTim db3354176c NpcManager stores test server NPCs under a different server name 2014-10-20 18:08:28 -04:00
Jonathan Williams 8630a1ba4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 23:39:21 -05:00
Jonathan Williams e3cd6f0e69 Fixed Mem leak in CustomTagFix
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
2014-10-17 23:29:24 -05:00
Chiss 075bc0af1d Added gem rewards for MS achievements 2014-10-17 21:20:04 +11:00
Jonathan Williams 2bbb29c8bb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 02:57:30 -05:00
Chiss f5efea1e9a Missing files 2014-10-17 18:34:23 +11:00
Jonathan Williams 6d38f4e238 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 00:42:01 -05:00
Jonathan Williams 8466b8e2dd Fixed building issues with EnjinTranslator
MAde mysql repo always record rank change even if windows return rank is different.
Added rough single player replay functionality.
2014-10-17 00:41:23 -05:00
CoderTim 248438535b Preserve pitch and yaw in NpcManager teleportations 2014-10-16 22:31:09 -04:00
CoderTim 930cdf6c07 Hide NpcManager blank custom names 2014-10-16 22:24:24 -04:00
CoderTim edb2c4f26a Merge remote-tracking branch 'origin/master' 2014-10-16 22:15:20 -04:00
CoderTim 1fb21d6143 Fixed some NpcManager bugs 2014-10-16 22:13:41 -04: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
Shaun Bennett c855c46940 Add coin command for online players, better way to handle this soon 2014-10-16 17:46:00 -05:00
Chiss c30171d24f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-16 12:03:09 +11:00
CoderTim 233e6d0b46 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-15 20:44:50 -04:00
CoderTim 535506393f Added ability to customize NPC zombie adulthood, slime size, and villager profession 2014-10-15 20:44:42 -04:00
Shaun Bennett 76dc735b6b Fix bug I was getting with ShopItem 2014-10-15 15:05:31 -05:00
Chiss 82e95f714a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 16:57:38 +11:00
Chiss b83b0e61e6 fixed long lines in achievements
added night to halloween maps in parser
2014-10-15 16:57:25 +11:00
Jonathan Williams a6a4808222 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-15 00:27:01 -05:00
Jonathan Williams a81bdb4e32 Fixed bug with armor stands showing up for customNameVisible = false; 2014-10-15 00:26:36 -05:00
Chiss c3fdae135e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 16:11:08 +11:00
CoderTim 25b10f0925 Added /npc refresh command to NpcManager 2014-10-15 01:04:52 -04:00
CoderTim ed64c1972d Update accountStats rows before inserting to prevent id column from skipping on failed inserts 2014-10-15 00:54:23 -04:00
Chiss d8a8061746 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 15:44:41 +11:00
Chiss eb5af41323 Added halloween reward pet
minor bug fixes
2014-10-15 15:44:26 +11:00
CoderTim 2a18888922 Improved NpcManager to work with persistent maps 2014-10-14 22:22:17 -04:00
CoderTim 256df99b7b Added MineStrike to achievement gui 2014-10-13 23:48:38 -04:00
CoderTim 3ba748f2de Merge branch 'feature/currency-log' 2014-10-13 23:13:44 -04:00
Jonathan Williams 1dd51bcac5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 21:07:10 -05:00
Chiss 15b6a80613 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-14 13:02:17 +11:00
Chiss ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
CoderTim 8f90c96019 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 20:45:55 -04:00
CoderTim 2016ea09cb Added achievements to games and Achievement enum 2014-10-13 20:38:58 -04:00
Jonathan Williams 0194a041e2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-12 20:57:32 -07:00
Jonathan Williams 3e7787a354 Fix for customer support GemHunterCommand
Fix for UUIDFethcer pulling while player is online.
2014-10-12 20:57:17 -07:00
Chiss a4b85053d9 fixed bug where blockmorph was crashing hubs. 2014-10-13 14:56:19 +11:00
Chiss 25fbe24d20 improved sound output of coin bomb 2014-10-13 14:13:57 +11:00
Chiss e41b10ccb8 minor UHC fix 2014-10-13 14:09:58 +11:00
Chiss 9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Jonathan Williams d3788e8ddc Fixed redis server time functions.
Added kill option for servers with motd Finished in servermonitor
2014-10-11 04:40:53 -07:00
Jonathan Williams 797dd002ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:43:56 -07:00
Jonathan Williams a54b78fefa Added Mine-Strike to Quick Game menu.
Fixed up CoreClientManager's rank update.
2014-10-11 02:32:02 -07:00
Jonathan Williams 19afebe53d Added in mysql hooks for coins/gems/ranks for database conversion preperation.
Added in failover database calls in CoreClient/DonationManager
2014-10-11 01:32:22 -07:00
CoderTim 3422f48325 New acheivements 2014-10-10 21:49:03 -04:00