75cf80652c
Remove customnametrue from horse mount
2014-12-16 01:36:42 +13:00
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
e02bcd8b84
Revert the revert of the revert.
2014-12-14 22:58:49 -05:00
d1be64d7e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
4482e46250
Changed int to atomic for concurrency
2014-12-14 21:53:55 -05:00
eefa4de838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-14 20:50:35 -05:00
2a58b822a0
Safeguard on connecting vlaues.
2014-12-14 20:50:19 -05:00
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
9fb2231d76
Added connecting clients as a factor for status snapshot.
...
Added online check for DonationManager rewarding local info.
2014-12-14 02:32:52 -05:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
86b9d8342f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
358d5fde44
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-10 22:38:19 +11:00
450d3eb923
merge
2014-12-10 22:38:08 +11:00
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
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
db8e0484ab
missing files + new pet
2014-12-10 18:23:22 +11:00
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
bee81ff455
lowered coin rewards
2014-12-09 20:23:56 +11:00
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
ef8e5104f1
SnD Kits
...
minor bug fixes
2014-12-08 17:28:18 +11:00
64c8edc292
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-08 17:25:03 +11:00
0759a373da
Fix treasure chest hologram
2014-12-07 01:25:36 -06:00
7402eb2f91
Merge remote-tracking branch 'origin/master'
2014-12-06 01:00:40 -06:00
1276e0c0d5
Chat Slow Command
2014-12-05 21:33:31 -06:00
21e80af6cb
Fixed Cosmetic menu buttons
...
Removed map in wrong location
Removed message for removing armor.
2014-12-05 01:15:25 -08:00
828e8d4115
Fixed bug with ok buttons still active after clicking ok in confirmation page.
2014-12-04 23:48:22 -08:00
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
80971c2fe7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-05 16:27:30 +11:00
4430efd7be
minor updates
2014-12-05 16:25:34 +11:00
f48085d5ca
Merge remote-tracking branch 'origin/master'
2014-12-04 17:41:40 -06:00
0bb2d1db5b
Some changes *_*
2014-12-04 17:29:47 -06:00
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
1fd1e5cc34
Removed unused gem booster code.
2014-12-02 12:50:53 -08:00
384f296d60
checkPlayerName returns actual name (casing correct)
...
Refactored chests/keys in support server.
Fixed bug with enjin chest/key giver.
2014-12-01 16:14:02 -08:00
0540168af7
Fixed CCM in AntiHack
2014-12-01 03:01:26 -08:00
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
172f4d20b7
Removed gem transaction logging.
2014-12-01 02:22:51 -08:00
5038edc46b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 00:07:33 -08:00
171eec5a37
Removed reward logging.
2014-12-01 00:05:57 -08:00
89892097d0
No one cares about ComplexItemLayout
2014-11-30 16:48:57 +13:00
9d32048b9e
Fixed merge conflict problem.
...
Added spawn repository.
2014-11-29 03:17:33 -08:00
f507db7664
Reworked spawn to save to database.
...
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
4b2998793c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-28 14:16:07 -08:00
b3beadf8b5
made recharge look nicer for 1.7
...
added missing files
2014-11-29 09:14:33 +11:00
54aefbf40d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-28 14:10:28 -08:00
ca34ac4e02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-29 09:09:23 +11:00
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
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
62a172e01b
Removed all the UUIDFetcher calls.
2014-11-27 22:34:05 -08:00
8f9f88987b
mods can no longer use /tp Here
...
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
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
d5d9e2eb14
Don't bother with these checks in ItemLayout
2014-11-28 09:30:57 +13:00
8d12b8e565
Check item has Lore before trying to use it
2014-11-28 09:30:27 +13:00
d1b6aee802
Change ItemLayout to allow repeats of item arrays
2014-11-27 14:34:34 +13:00
bd8ca593e8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy
2014-11-27 08:06:13 +13:00
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
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
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
b160822260
Add follow entity to holograms
2014-11-27 03:17:59 +13:00
f5533dbce2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy
2014-11-27 01:13:14 +13:00
c76ad50136
Allow removal of packet handler
2014-11-27 01:08:42 +13:00
84b56708f9
Added new class ItemBuilder for chain building ItemStacks
2014-11-27 01:08:38 +13:00
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
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
30e2de6f22
Remove the 'Made by Shaun'
2014-11-27 00:50:02 +13:00
00e372820b
Fixed UI update when purchasing items.
2014-11-26 02:13:19 -08:00
2afe84d7c7
Fixed stupid query thing....defek7.
...
Removed extra logging.
2014-11-26 00:59:10 -08:00
3ad3fb21ff
Fix up mistakes in the previous modifications
2014-11-26 21:35:45 +13:00
f39e3dcec7
Fixed traversing resultSets.
2014-11-26 00:08:51 -08:00
06526d1e96
Fixed sql bug in FriendRepository
...
move/cleanup in RepoBase
2014-11-25 21:45:34 -08:00
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
909877c869
Wiggle left, wiggle right, hope this works.
2014-11-25 21:17:30 -08:00
4ccb242066
i added a space!
2014-11-26 16:02:11 +11:00
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
484dfaaea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-25 13:25:41 -08:00
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
3c76fde190
Ignore wither skulls for CustomTagFix
2014-11-26 09:51:08 +13:00
141c08ceb8
Remove old holograms and add new holograms
2014-11-26 09:18:36 +13:00
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
c7f2a8072e
Antistack replacement
2014-11-23 19:51:23 -06:00
2871446f74
reduced max amount of blocks from explosions
2014-11-23 15:01:04 +11:00
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
d1578b12d4
Removed extra console logging.
2014-11-21 14:45:55 -08:00
7bd12ab850
Re-did benefits and inventory to only update locally if db succeeeds......DOH
2014-11-21 14:41:25 -08:00
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
2446e6d64d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-20 21:42:40 -08:00
1f5be77880
Fixed text in Dom shop.
...
Cleaned up some code in benefit stuff.
2014-11-20 21:42:33 -08:00
f1ba5947a4
Some more wither updates
2014-11-21 16:32:12 +11:00
6c63552480
Refactored RankBenefitsGiver9000
...
Added Thanksgiving benefits (1 treasure key).
ServerMonitor now ignores Testing group.
2014-11-20 21:24:23 -08:00
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
ab78b4b89d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-19 22:25:17 -08:00
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
450cc9ada2
Champions achievement update
...
Wither update
2014-11-20 17:21:22 +11:00
e99a3f6544
Merge remote-tracking branch 'origin/master'
2014-11-17 18:19:06 -06:00
f071d2e727
Fix for TNT explosion in Bridges
2014-11-17 18:09:58 -06:00
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
857ff29461
Removed buggy player disguises.
...
Removed datavalues from wither disguise.
2014-11-15 03:21:48 -08:00
48c522a86b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-15 03:03:52 -08:00
8d6793060c
made early levels a little easier to progress through
2014-11-15 21:33:28 +11:00
2af66c99e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-15 01:17:21 -08:00
df76f6be10
More work on Clans.
2014-11-15 01:13:14 -08:00
685a2899ca
Added custom name to wither disguise.
2014-11-15 01:12:58 -08:00
51bc53262d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-15 19:32:08 +11:00
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
521b1e5f3b
Merge remote-tracking branch 'origin/master'
2014-11-13 21:54:15 -06:00
2cf76ae5b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-13 19:15:05 -08:00
4812da2cd9
More work on Clans - Clan repository.
2014-11-13 19:14:56 -08:00
62fbeeda20
Added Wither disguise.
2014-11-13 19:14:14 -08:00
af31f4cd42
Add Tab handling for MultiCommandBase and "game set" command
2014-11-13 18:22:00 -06:00
48c09aa311
Making spectator gui look better
2014-11-13 18:05:28 -06:00
eb4b451e12
Fixing some spectator gui bugs
2014-11-13 16:41:42 -06:00
9eaacd20ab
fixed slime healing
...
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
c5a873ffab
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-13 14:40:26 +11:00
f9f7a834c2
geno morf
2014-11-13 14:38:33 +11:00
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
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
0193c397fb
Added Kit unlocks to staff server
...
Added password persistence in db.
2014-11-12 19:20:41 -08:00
2e848c2ac2
Fixed some of twiggy conflicts.
2014-11-12 05:13:58 -08:00
8d62966abc
Created Clans project.
...
Converted Fields code complete (not tested).
2014-11-12 05:13:16 -08:00
71a93bead5
Updated punish to be even less confuse.
2014-11-12 09:49:03 +11:00
d7141e4943
Added warning note to punish
2014-11-11 20:02:35 +11:00
f7ad986503
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-11 19:05:58 +11:00
c0f2f8a88c
Remove useless comment/import
2014-11-11 01:47:03 -06:00
23ab9756dc
Merge remote-tracking branch 'origin/master'
2014-11-11 01:32:55 -06:00
b08cd54666
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-10 23:31:38 -08:00
827fef535f
Some commented out testing code in DisguiseManager
2014-11-10 23:30:41 -08:00
108421164c
Added support for stats with spaces in them for GiveStat.
2014-11-10 23:30:16 -08:00
5b9b7347c6
Add tab complete processing for commands
2014-11-10 23:49:35 -06:00
6c6c51e950
fixed compilation problems
2014-11-11 14:28:35 +11:00
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
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
d362fb3b1c
fixed punish error
2014-11-10 19:15:56 +11:00
0252db5a05
Punish simplification update
2014-11-10 18:40:39 +11:00
d5515d11b2
fixed kick reason for bans
2014-11-09 14:27:01 +11:00
6405253b1c
added word wrap on punish text in GUI
...
only staff+punishee will now see punishments
2014-11-09 14:09:30 +11:00
3c39e3d93a
changed sev2/3 hack punishements
...
updated ban kick/login messages
2014-11-09 13:47:25 +11:00
a1f7fc5187
warnings are now friendly :)
...
reach hack detection base
2014-11-09 12:22:55 +11:00
2781bb3000
Removed stacking buffers.
2014-11-08 14:32:37 -08:00
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
4c98d833e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 18:33:46 -05:00
96f54c2949
Made DBPool class uninstantiatable
2014-11-07 18:27:20 -05:00
24725eb22e
play a sound when you get punished
2014-11-08 10:15:46 +11:00
44fbd9fdd2
updated punishment output.
...
punishee is now informed of the reason in chat.
2014-11-08 10:11:12 +11:00
3a3c2002f5
fixed level exp requirements
2014-11-08 09:17:59 +11:00
c61ad8907a
set minimum MP level for staff
2014-11-08 09:15:27 +11:00
libraryaddict
Chiss
Jonathan Williams
Shaun Bennett
Shaun Bennett
libraryaddict
MrTwiggy
CoderTim