95c38b1939
Don't use static instances.
2015-11-02 23:30:06 +00:00
3b38302429
Optimized TaskManager task locks and calls.
...
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
55d028d706
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-01 22:09:58 -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
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
d09ed2a823
Small changes and missed changes from last commit.
2015-11-01 16:47:54 +00: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
71e49854db
Add halloween hats
2015-10-31 02:10:15 -04: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
4884032a1a
Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3
2015-10-30 23:24:32 -04:00
0486404c4b
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/Arcade.java
2015-10-28 14:38:34 +13:00
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
394e501682
Merge branch 'master' into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-10-24 17:50:26 +01:00
29587b93f7
Implement initial report interface.
...
Added getPlugin() method to CommandBase.
Changed mini-plugin name from "ReportPlugin" to "Report" to match the other mini-plugins.
This is very WIP, still a lot to be done.
2015-10-24 03:41:03 +01:00
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
f7dab72e8c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 03:23:35 -04:00
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
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
523378aae7
Clans War updates
2015-10-17 22:55:21 -04:00
3a0781b3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
14a524cf54
Stuff
2015-10-17 00:08:30 +13:00
d00fa856f3
Fixed Pets so they work correctly.
...
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
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
bef942f6da
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-12 00:47:56 -04:00
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
930cfa5cb8
DONE
2015-10-10 02:30:11 -04:00
245a42c8e0
animation is sexi
2015-10-10 02:13:04 -04:00
30a9196430
Done with animation.
2015-10-10 01:43:31 -04:00
9a7357e484
Work
2015-10-10 01:00:49 -04:00
1127764cc3
Secsi
2015-10-09 22:44:49 -04:00
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
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
90c685617d
Animation
2015-10-09 22:14:01 -04:00
ed89f5f4cc
anim example for myst
2015-10-10 10:46:12 +11:00
43f38c18ee
animation
2015-10-10 10:40:44 +11:00
02c6eccfda
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
7dbd9da582
dragon sale Bar
2015-10-10 10:35:48 +11:00
586cc6e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-09 09:40:58 -06:00
cdb9741438
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
2015-10-08 20:36:16 -04:00
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
e2e2356b04
stuffs
2015-10-06 13:25:15 +11:00
631bd9cfa6
Removed sale notification.
...
Removed queue create table query.
Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
2015-10-01 07:38:59 -07:00
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
49908e7550
- Added game to hub text
2015-09-25 04:28:11 -04:00
a488bfab3e
- Rewritten testrank system
...
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
cf618abd4e
BotSpam Module
2015-09-22 01:38:45 -04:00
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
0ac808ba43
stacker pref is now only for pvp stacking.
2015-09-05 10:30:11 +10:00
fc5ccd4a5e
fixed 'self scoring' in Soccer
...
removed silverfish on wither pet despawn
2015-09-05 10:04:54 +10:00
106a7dab2e
removed ability for entities to change blcoks in hub
2015-09-05 09:48:06 +10:00
54f910845e
Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop.
2015-08-30 12:28:44 -07:00
c1b356e42f
Fix asynchronous race conditions in ServerData.
2015-08-29 19:05:14 -07:00
da3810e5a3
Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers.
2015-08-29 17:57:18 -07:00
138a4cf638
Fix bug where transferring a clan to destination server would not load properly server-side.
2015-08-29 17:43:12 -07:00
f47c1b5c14
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 17:33:08 -07:00
5df7a5e0c9
Fix bugs related to multiple server UI and clan server transferring.
2015-08-29 17:31:54 -07:00
820bc1af44
Setup new module for intellij, fix field ore
2015-08-29 16:56:26 -07:00
197309b914
Commit left-over changes to merge and pull.
2015-08-29 15:44:29 -07:00
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
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
cd145324d8
Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit
2015-08-28 12:00:23 -07:00
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
bbe5b79c7e
Disabled AntiHack create table.
...
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
14bf8faf3a
disabled big sale
2015-08-18 09:49:53 +02:00
8ab8388344
Merge remote-tracking branch 'origin/master'
2015-08-17 05:05:36 -05:00
dc8bec340e
Rename Quick game menu for consistency
2015-08-17 03:18:35 -05:00
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
91ce9cfba7
fixed a crash with fireworks
2015-08-16 08:39:03 +02:00
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
5fa9135b08
renamed soccer to slimeball :)
2015-08-13 14:11:22 +02:00
534c91c706
remove items from inside soccer
2015-08-13 13:24:55 +02:00
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
fcfb2559b8
players cannot grab slime :O
2015-08-12 14:41:33 +02:00
d1302e8dc3
fixed full msg
2015-08-12 12:42:59 +02:00
5293e24469
fixed text
2015-08-12 11:58:40 +02:00
cd5c7e7110
fixed kb
2015-08-12 11:23:19 +02:00
f19efb4a93
renamed football to soccer
2015-08-12 09:23:00 +02:00
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
07bdbdde46
minor grammar issue
2015-08-11 09:55:10 -07:00
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
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
65b51a137c
new party tute room
2015-08-10 14:50:44 +02:00
bd2c9aa5e6
hub stuff
2015-08-10 14:00:02 +02:00
8745884153
Various fixes
2015-08-10 04:51:11 -05:00
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
6f8d6f8a40
Move Bonus and Poll to core
2015-08-10 01:55:50 -05:00
a0be3fa964
Use atomic mysql operations for modifying tickets
2015-08-10 01:19:10 -05:00
511cc76bef
Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)
2015-08-10 00:47:36 -05:00
28806aaf0a
Update Bonus amounts, Attempting to fix Votifier plugin for EU/US
2015-08-10 00:33:54 -05:00
d20fe54010
Disable carl features when carl can't be found
2015-08-09 16:36:48 -05:00
c2d066a576
ui fixes
2015-08-09 19:31:24 +02:00
41dcc564c9
polish polish polish
...
MAKE IT SHINE!
2015-08-09 19:02:07 +02:00
8c66ef7f15
changing Hub items and adding Profile GUI.
2015-08-09 18:33:44 +02:00
5a7de8ef3d
hub fixes
2015-08-09 17:21:56 +02:00
941e746ca9
Finalizing Poll GUI in Carl's GUI.
2015-08-09 16:47:03 +02:00
85c8e42f53
Finalizing and improving the Carl spinner and adding creeper explosion animations.
2015-08-09 15:00:54 +02:00
e6519206af
Add event to be called when a player tries to buy a carl spin
2015-08-08 16:29:03 -05:00
cbb0cb96c8
ensured white
2015-08-08 13:54:35 +02:00
e030331565
fixed some bugs
2015-08-08 13:51:37 +02:00
fa7f19bde5
removed debug
2015-08-08 13:47:30 +02:00
328c31de88
hub Update
...
fixed bad gameid
2015-08-08 13:47:09 +02:00
4f6dfdb856
Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes
2015-08-08 06:35:25 -05:00
eab7aa59f2
hub update!
2015-08-08 09:27:49 +02:00
47cb98066d
Hub fixes
2015-08-08 08:19:07 +02:00
33c96f51ae
fixed some stuff
2015-08-07 22:59:50 +02:00
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
f76d9b0d37
Replace Consumers with Callbacks
2015-08-07 04:20:54 -05:00
5ebc7080ee
Push fixes
2015-08-07 04:13:09 -05:00
320a3efe5b
Remove some debug code.
2015-08-07 02:22:58 -05:00
e8c60e6e84
Added storage of pets in mysql. Going to have live while backend process is copying data over.
...
Updated ServerTypePage to resolve clicking issues with solo/team pages.
2015-08-07 02:22:13 -05:00
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +02:00
f37e25e9d7
Finish push for today <3
2015-08-07 07:03:15 +02:00
608e8bf693
For Sarah <3
2015-08-07 05:40:16 +02:00
5f435a079e
Update vote button
2015-08-06 21:59:21 -05:00
be18dc1bf5
Add experience rewards to reward manager
2015-08-06 21:41:56 -05:00
6311ceaa0f
Reward work for new Game reward rarity and setup for carl, work on carl spinner
2015-08-06 21:15:17 -05:00
1680b652db
Added Hat layer skin
...
Added Sneak animation
With love from Morten <3
2015-08-07 03:10:17 +02:00
44e30a0903
SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui
2015-08-06 15:34:56 -05:00
d8041ba582
Fixing Players can disguise as disguised Players.
2015-08-06 20:57:56 +02:00
4a10f8d71a
fixing very last bugs. Ready to push!!!
2015-08-06 13:23:38 +02:00
35d999d747
Remove some debug messages
2015-08-06 05:56:31 -05:00
9e9f9862d0
Bonus bonus bonus!
2015-08-06 05:47:32 -05:00
6947b54e66
16 char limit and Steve Skin.
2015-08-06 09:45:02 +02:00
5809359449
Random Player disguises.
2015-08-06 09:19:19 +02:00
208ce95c97
No youtuber Disguise.
2015-08-06 09:11:39 +02:00
b52a9477fe
No Staff disguises!
2015-08-06 09:07:30 +02:00
16a8164030
Fixing last bugs and disabling coin bombs while diguised.
2015-08-06 08:42:09 +02:00
4cad99eb76
Lots of bonus work, start adding Votifier plugin
2015-08-06 00:45:39 -05:00
da5387c54f
Fixed ConcurrentModification for ServerManager cooldowns.
2015-08-05 01:33:09 -05:00
bcd4f4f9e2
Open gui through npc
2015-08-05 00:41:50 -05:00
b2116cc7e8
Merge branch 'OldServerSelector'
2015-08-04 13:56:23 -05:00
813dfb26b3
Finalized revert to old server menus.
...
Tied in solo/team buttons to use old server menu as well.
2015-08-04 13:54:06 -05:00
b33b0ac935
More bonus work
2015-08-04 04:00:51 -05:00
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05:00
fc412b0782
Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG.
2015-08-03 14:36:51 +02:00
37b779f108
Fixes for servers.
2015-08-03 05:55:33 -05:00
6c0666c59b
Fix for server groups / teams.
2015-08-03 03:20:27 -05:00
302252f193
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:56:31 -05:00
af0d769d3d
Fixed skywars quick shop.
...
Fixed issue with skywars not opening.
Fixed chest size for MPS
2015-08-03 02:56:24 -05:00
5bb2f80b8e
fixed text
2015-08-03 09:54:34 +02:00
72c473ad6b
removed annoying mineplex thing from subtext in news
2015-08-03 09:51:10 +02:00
adcd91bf61
Servers with more than 40 max slots always send to largest server.
...
Fixed space in Solo lore.
2015-08-03 02:07:23 -05:00
6a1e5d6bfc
changed item text
2015-08-03 08:23:49 +02:00
c32074e733
Fixed MPS/Event server guis so they open up like old.
...
Changed sticks to player heads in solo/team selection.
2015-08-03 00:53:06 -05:00
bfaa0e6849
Fixed event/mps hardcode.
2015-08-02 23:51:43 -05:00
58933fc855
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 21:19:00 -04:00
944a4a9535
Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process.
2015-08-02 21:18:24 -04:00
a561bbbf12
Added hardcode for EVENT/MPS :D
2015-08-02 19:41:42 -05:00
cadd21c18b
More bonus work
2015-08-02 19:12:39 -05:00
32a2687991
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 20:00:15 -04:00
d9a641fd92
Updated ServerManager to read server npc stuff from redis.
...
Updated ServerGroup to have NPC name in it.
2015-08-02 18:59:43 -05:00
4852e69991
Temporary un-finished changes for adding in team/solo UI pages and allowing players to select.
2015-08-02 19:19:40 -04:00
70c1b883db
Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups.
2015-08-02 18:20:52 -04:00
c2f6c402da
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 13:25:09 -04:00
612d967aa0
Add ability for auto-joining of gametypes to bypass manual server selection by player.
2015-08-02 13:24:59 -04:00
db15ffad72
Bonus changes + Update jooq
2015-08-02 05:17:51 -05:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
11e49b9678
Some updates
2015-08-02 04:28:57 -05:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
fd65f27f0f
Fix some typos/formatting issues
2015-07-31 10:01:19 -05:00
b623f025ff
manually updating something
2015-07-29 14:31:11 -07:00
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
971908d38b
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:52:43 -04:00
832fb4638a
More things
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:42:00 -04:00
7d9fd61c8e
Display changes
2015-07-26 22:31:40 -07:00
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
47d410370d
Merge branch 'horus-bug-fixes'
2015-07-26 18:20:39 -07:00
6d367e3cee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:38:54 -07:00
84be48f264
Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.
...
Added conversion of stats to new stat table via StatHandler.
Changed stats value from int to long.
2015-07-25 01:30:50 -07:00
13f47ad903
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
2015-07-24 13:59:01 -05:00
fe80ed373a
Fix numerous trello bugs
...
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
2015-07-22 22:28:44 -07:00
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
0b49d053fe
Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events.
2015-07-20 15:57:57 -05:00
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
2b2e5e5c97
Spelling fixes + Observer mode
2015-07-16 15:51:21 -05:00
5c5e7dd4a9
Merge master into clans
2015-07-13 20:42:10 -05:00
e36b0440a4
Merge branch 'bench'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10:00
9ccc85a79e
Improved block restore for Events
2015-06-30 22:30:49 -05:00
4ff456b722
Merge remote-tracking branch 'origin/master' into foo
2015-06-29 11:29:22 -07:00
2963f7a61c
stacker wont give too many msgs
2015-06-29 10:13:33 +10:00
0ea388379a
reduced win req for skywars ach
...
enabled beenfit for 40k reward
2015-06-28 15:16:05 +10:00
4b634d1bc3
Fix slashes (this won't affect windows users, right?)
2015-06-26 10:14:37 -07:00
8c427bee24
Fix _gameDisplay bug.
...
Fix Skywars quickmenu link.
2015-06-26 03:57:39 -05:00
1aa0832bb9
SkyWars to Skywars
2015-06-26 17:55:49 +10:00
17af562f19
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 17:36:25 +10:00
59f730ae9d
changed sky text and icon to feather
2015-06-26 17:36:12 +10:00
f906f08a18
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 02:34:36 -05:00
60901cc17e
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-06-26 02:32:51 -05:00
7c698f65cf
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
2015-06-26 02:31:35 -05:00
c78ef9d93d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 02:30:01 -05:00
015ba53bbe
skywars hub text
2015-06-26 16:39:25 +10:00
efa06d370b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 01:13:42 -05:00
86e2514e37
Fixed callbacks for gem/coin rewards.
2015-06-26 01:13:28 -05:00
2bf1faa70d
fixed a few skywars bugs
...
added ore generation (but theres some wierd bug, still working on it)
2015-06-25 20:24:31 +10:00
91b5beaff2
Fixed new Chat constructor requirement.
2015-06-20 03:43:38 -05:00
da981980df
Added world.setThundering(false);
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:35:11 -04:00
61494f93ba
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench
2015-06-19 18:13:48 -04:00
8a224950b3
Added sale notifications
...
Added 3s chat delay
2015-06-19 13:27:59 +10:00
b0ca5ca4aa
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-17 20:54:28 -04:00
37c6593753
Hub: Fix rulebook
2015-06-10 05:27:19 +12:00
574dd16022
Hub: Modify rulebook
2015-05-30 10:20:28 +12:00
f0c7f2fe76
Merge branch 'MSSQL_Conversion'
...
Conflicts:
Website/LOCWebsite.suo
2015-05-17 23:11:50 -07:00
5a8f93f3db
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-14 00:12:22 -07:00
b7cdc82cd2
Fixed server sorter for UHC.
...
Work on converting to UltraDNS api.
2015-05-14 00:12:13 -07:00
2c020d10a6
Merge remote-tracking branch 'origin/master'
2015-05-13 22:52:22 -05:00
84c53347f8
[Hub] Add UHC to Quick server menu. Better formatting coming soon!
2015-05-13 22:52:14 -05:00
2c3116a7a6
removed firework and sound from legend join
2015-05-13 15:45:29 -05:00
1c6a12528c
Added ability for LT to modify Admin ranks.
...
Added Twithc rank to the updateRank list.
Fixed server sorting issues with UHC Generating servers.
2015-05-13 00:58:45 -07:00
98dcb9747a
Added UHC support to server sorter.
2015-05-13 00:10:17 -07:00
f9735006b8
removed hub uhc hourly announcements
2015-05-13 00:05:00 -05:00
53555a42cd
[Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats
2015-05-12 17:14:50 -05:00
643ed2c047
Fixed most enchants not working
...
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
a558995e12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-12 09:52:21 +12:00
b1a46d0f0d
Converted TaskManager
2015-05-11 01:21:27 -07:00
46c07665e1
Merge remote-tracking branch 'origin/master'
2015-05-11 00:44:34 -05:00
800ce68637
Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking)
2015-05-10 16:58:04 -05:00
241935ef63
SurvivalGames: Removed description of deep freeze and updated to beware of borders
2015-05-11 09:13:04 +12:00
822718095d
cannot PM from spawn
...
first push of cards game
2015-05-09 12:23:07 -05:00
a7407d8b8c
Added all minigames standalones into mixed arcade player count.
2015-05-04 22:51:21 -05:00
4252bf70df
Fix Master Builder game button in quick menu.
2015-05-04 01:40:57 -05:00
c8b5c84aa6
Added Master Builder quick game menu option.
...
Added player counts to quick game menu
2015-05-04 00:42:49 -05:00
4f4aeac12c
fixed typo
2015-05-03 23:34:09 -05:00
e013f8af8a
sky text for hub change
2015-05-03 19:49:16 -05:00
40d56c3500
Converted all code to updated UtilParticle methods
...
/suicide
2015-05-03 16:37:00 -05:00
283d550903
Added Wizards to quick game menu.
2015-05-01 01:24:01 -05:00
fa4466b6a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-05-01 00:13:39 -05:00
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05:00
9f8fe3bf78
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-04-22 03:45:59 +12:00
c79432c8b9
Fixed projectile hitboxes and specific values
2015-04-04 10:54:03 +11:00
ff0883e7d7
fixed easter egg duration
...
parser list improvement
2015-04-03 21:47:43 +11:00
ed35d2a992
April Fools update
2015-04-01 16:56:13 +11:00
50c38dc467
April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA
2015-03-31 17:22:50 -04:00
f4061854cd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-25 15:11:17 -07:00
6472194d44
Optimized queries to retrieve and update player information by removing inner join calls on the account.
...
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
09fe3ad6a8
NewsManager : Reduced dynamic string generation every time news changes
2015-03-25 15:04:00 -07:00
5fded981d9
Timings for Visibility
2015-03-23 16:38:17 +11:00
28b3828007
slowed hub invis update
2015-03-20 23:48:17 +11:00
52f0941fb9
Add resourcepack options
2015-03-17 23:59:24 +13:00
73c66fa93f
Merge branch 'SpecRemoveCreative'
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
4581f49948
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-16 13:39:54 +11:00
420c4e7229
More work on Event game
2015-03-16 13:39:33 +11:00
cb93769e03
Converted Bungee to redis.
...
Increased DBPool maximum connections to 5.
2015-03-13 17:53:36 -07:00
c5d48a82a3
Fixed invisibility bug
2015-03-13 11:34:45 +11:00
bf87cfd0cd
Merge remote-tracking branch 'remotes/origin/sql_pooling'
2015-03-11 18:30:52 -07:00
626bfc35fc
Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.""
...
This reverts commit 215ec7b00d
2015-03-11 18:05:13 -07:00
0b2ce48b3e
Fix dead lobbies bug.
2015-03-11 17:27:21 -07:00
215ec7b00d
Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."
...
This reverts commit adfe5fb74e
2015-03-07 19:38:06 -05:00
adfe5fb74e
Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.
2015-03-07 19:36:54 -05:00
09ecb994f6
Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
...
Removed ArcadeRepository as its unused.
Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
bfb0c157a2
Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths
2015-02-25 13:56:32 +13:00
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
d29b43d645
Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages.
2015-02-17 15:17:14 +13:00
9bdf248643
Add cross-server message and adminmessage commands. Fixed casing on messagecommands package.
2015-02-12 04:08:06 +13:00
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
26463ba75d
Treasure changes :O
2015-02-09 20:24:20 +13:00
c285fae035
Merge remote-tracking branch 'origin/master'
2015-02-06 23:40:14 -05:00
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
8851cccff4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-07 03:53:17 +13:00
68d1ba4507
Add API to create walls of maps to create a giant image. Please use responsibly.
2015-02-07 03:52:19 +13:00
922f2d5ee9
Merge remote-tracking branch 'origin/master'
2015-02-05 23:20:45 -05:00
fcb3d20778
Move tablist stuff to portal, show current server on tablist
2015-02-05 23:20:39 -05:00
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
dbd6f449eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2015-02-05 11:37:35 +11:00
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
b0a2e655c1
Changes to IntellIJ Files
2015-02-03 14:12:52 -05:00
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
c8be08e5b9
Merge remote-tracking branch 'origin/master'
2015-01-16 15:30:16 -05:00
b395508f0e
54b7f21604c94e9ad2f53956 Flag for Poll DIsplay
2015-01-16 15:30:06 -05:00
78cd5e7070
Changed hub to normal.
2015-01-15 00:39:07 -08:00
c83643564b
Fixed scoreboards reading from file.
...
Fixed scoreboard server name length
Changed how we pull server group on startup.
2015-01-13 12:22:47 -08:00
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
8e04a2a5f2
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
...
Refactored portal method names.
2015-01-11 00:42:31 -08:00
47fc6e3b94
Revert "Added pool based repository and converted everything but account and donation repositories to it."
...
This reverts commit 8de8d31eec
2015-01-11 00:41:40 -08:00
8de8d31eec
Added pool based repository and converted everything but account and donation repositories to it.
2015-01-10 11:53:25 -08:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
aca7fd6849
Removed all create calls
2014-12-31 09:38:41 -05:00
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
008980d9ca
Slowed Server page update speed.
2014-12-24 01:36:33 -05:00
cff63ca3e3
Phinary needs some sleep!
2014-12-23 08:07:46 -06:00
9c1e3aa7aa
Ignore full or dead servers
2014-12-23 06:26:51 -06:00
c40a5a8eac
Another bugfix
2014-12-23 06:20:36 -06:00
582ed34d21
Fix for staff hosted
2014-12-23 05:48:45 -06:00
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
d8311d860e
Ignore private servers
2014-12-23 04:21:37 -06:00
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
7ef2edd498
Removed extra enjin message.
...
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +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
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
b99da44873
Disable mail and notifications
2014-12-06 01:00:02 -06:00
54d8fe21fb
Notifications and stuffs?
2014-12-04 22:48:54 -06: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
abaf9f4693
Refactored IRelation method names
...
Added support for negative amounts in Support server.
Clans in core testing state.
2014-12-03 13:06:50 -08:00
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -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
cded2c7d8f
Update Polls to use new MiniDbClientPlugin
2014-11-26 12:07:06 -06:00
7c9226d6de
Fix mail to work with recent changes
2014-11-26 11:55:28 -06:00
c73a9f3bd5
Merge remote-tracking branch 'origin/master'
2014-11-26 11:39:13 -06: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
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
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
6efa416d81
Fixed glitching dom items in Hub due to portal throw.
2014-11-21 18:30:26 -08:00
6c63552480
Refactored RankBenefitsGiver9000
...
Added Thanksgiving benefits (1 treasure key).
ServerMonitor now ignores Testing group.
2014-11-20 21:24:23 -08:00
a73ee4e306
Structure for Mail system, not finished yet.
2014-11-20 14:41:25 -06:00
972911fe05
set achievement skills
2014-11-20 18:01:46 +11:00
d1a4080cbd
Added GUI support for achievement skills.
2014-11-19 22:47:10 -08:00
2384b91b06
game timer > advertisement
2014-11-16 14:45:18 +11:00
2e58342032
Removed MS from beta.
2014-11-15 19:27:37 -08:00
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
c61ad8907a
set minimum MP level for staff
2014-11-08 09:15:27 +11:00
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
c93862f299
updated player level
...
added /givestat command for owners (must use full string; Global.ExpEarned)
2014-11-07 22:10:41 +11:00
fadaa59526
added mineplex level
...
removed ability to go into negative gems as villager morph
2014-11-07 19:20:15 +11:00
a67842b504
returned hub to normal
...
removed flaming pumpkins from arcade
2014-11-07 12:54:38 +11:00
f931bd26e6
Updated ServerConfiguration to support resourcepack and Arcade settings.
2014-11-06 00:25:49 -08:00
6f2a6a6ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-05 14:45:54 -08:00
1a09c14642
Reverted database connection pooling because it caused severe login delays.
2014-11-05 14:39:22 -08:00
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
a2f7a84120
Fix Hub Rule Book
2014-11-03 18:46:49 -06:00
fa0049d22a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 23:01:15 -07:00
f3770933b6
Merge branch 'feature/database-pool'
2014-11-01 01:59:07 -04:00
45da22b0bf
Fixed bug with parkour enchantment checks.
2014-10-31 17:03:06 -07:00
b5ef46007f
updated npc info
2014-10-31 18:17:12 +11:00
4fc291ea80
Everything but Mineplexer using database pool
2014-10-29 18:43:21 -04:00
5244f65d8f
All connections to db.mineplex.com/Account use database pool
2014-10-29 17:54:40 -04:00
f0ba562265
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-27 18:11:29 -04:00
9f8b119fb7
Bug fixes
2014-10-27 18:09:23 -04:00
bd2e7faf3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-25 13:40:53 +11:00
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
6f541a8d30
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-24 18:00:18 -07:00
04ba68293e
Removed debug.
2014-10-24 18:00:10 -07:00
01f311a3d6
Added missing requirements for SG Achievement Kit
...
fixed a parkour exploit
2014-10-25 10:38:47 +11:00
25fc3c0645
Achievement Kits (3 games)
...
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
d4512e464a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-23 14:05:54 +11:00
c2bb53c887
Halloween pumpkins
...
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
8630a1ba4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 23:39:21 -05:00
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
075bc0af1d
Added gem rewards for MS achievements
2014-10-17 21:20:04 +11:00
98ffa53128
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 03:34:47 -05:00
752537b0f6
missing hubtype
2014-10-17 18:59:04 +11:00
2bbb29c8bb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 02:57:30 -05:00
f5efea1e9a
Missing files
2014-10-17 18:34:23 +11:00
6d38f4e238
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 00:42:01 -05:00
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
ec81e9f511
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-10-16 17:51:32 -05:00
5db2c072a0
Halloween update
2014-10-16 16:27:09 +11:00
58f69b49d7
Add new chat features to JsonMessage
2014-10-15 11:11:32 -05:00
e732523dcd
Merge remote-tracking branch 'origin/master'
2014-10-15 10:31:45 -05:00
b83b0e61e6
fixed long lines in achievements
...
added night to halloween maps in parser
2014-10-15 16:57:25 +11:00
eb5af41323
Added halloween reward pet
...
minor bug fixes
2014-10-15 15:44:26 +11:00
130b932f40
Fix typo in Free Server Timer
2014-10-14 14:30:44 -05:00
ed9dd6e894
Minor patches
2014-10-14 12:42:53 +11:00
a4b85053d9
fixed bug where blockmorph was crashing hubs.
2014-10-13 14:56:19 +11:00
3e92b02bab
Fixed max slot bug with ultra/hero
2014-10-11 05:56:47 -07:00
1d3b792ed8
UHC head apple fixes
2014-10-11 23:09:56 +11:00
d407cc7c4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:57:01 -07:00
95a4a34b47
UHC announcement Title
2014-10-11 20:55:48 +11:00
8ace0ce07c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:55:45 -07:00
316ce38056
Changed Utility time to ms
2014-10-11 20:53:39 +11:00
797dd002ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:43:56 -07:00
1a10ddb6a4
Fix for Open in
2014-10-11 02:43:02 -07:00
a54b78fefa
Added Mine-Strike to Quick Game menu.
...
Fixed up CoreClientManager's rank update.
2014-10-11 02:32:02 -07:00
a7ceb24b15
Hub UHC time log
2014-10-11 20:10:48 +11:00
dc0709f17e
HH Update
...
Added UHC to skytext for hub
2014-10-11 19:43:28 +11:00
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
e3747b5183
Minestrike fixes
...
Hub UHC announcer
2014-10-10 13:07:59 +11:00
8701f9ddcc
Added TabTitle
...
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11:00
9033843a31
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-03 01:50:35 -07:00
c641eab3c7
Fixed up friends.
2014-10-03 01:50:23 -07:00
17e34e2060
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 10:49:42 +10:00
31ceaad7fe
MineStrike audio update
2014-10-03 10:49:26 +10:00
9b2a2cbbd6
Fixed mounting blocks on yourself in 1.8
...
Added temp fix so 1.8 players can ride dragons again.
Removed Block form in parkour and fly for block form.
2014-10-01 02:12:11 -07:00
c2b84cc60f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-30 12:20:14 -07:00
c7d34e70ef
Merge remote-tracking branch 'origin/master'
2014-09-29 17:42:13 -05:00
92f8dc7f61
Add velocity toggle for mod+
2014-09-29 17:17:02 -05:00
7892c442d0
Add show mac reports user pref for mod+
2014-09-29 11:14:20 -05:00
34baa8eafb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-25 23:27:19 -07:00
8bca23f0ba
Fixed bug with custom tag fix :P
...
Fixed bug with server group up time check in servermonitor.
2014-09-25 23:27:08 -07:00
895878ee40
Removing old items, fix for a larger problemo
2014-09-26 09:33:12 +10:00
a54a2aadc0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-24 01:32:03 -07:00
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
969c7c0fde
Music gadget fixes
...
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
2014-09-24 15:46:55 +10:00
5c9ee3e79e
Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers.
2014-09-21 20:42:47 -04:00
be3e10a412
Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind.
2014-09-20 09:31:06 +10:00
9bbac7578e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-20 08:29:06 +10:00
960b0aa69e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-19 09:23:52 -10:00
ed85779876
Fix Treasure painball gun issue, fix parkour paintbull gun issue
2014-09-19 14:18:23 -05:00
96498af626
Fixed parkour bug with gadget blocks.
...
Removed a ton of debug messages with inventory close.
2014-09-19 09:06:42 -10:00
d0edde9dbd
Added rank benefit giver 9000
...
Added MineStrike to beta timer.
Updated official craftbukkit.jar
2014-09-19 02:57:35 -10:00
239b021b0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-18 22:03:49 -10:00
18f2ef7564
Re-enabled SNAKE PARKOUR for hub.
2014-09-18 22:03:23 -10:00
91037384f9
Loot tweaks
...
Music fixes
some bug fixes
2014-09-19 18:01:38 +10:00
ed7eeab1a7
fixed exception
2014-09-19 16:13:11 +10:00
01a6ff6069
costume reward fix
...
hub builder including database
2014-09-19 13:01:49 +10:00
aad3d59177
Merge remote-tracking branch 'origin/master'
2014-09-18 21:03:59 -05:00
5d643c00d5
treasssssurreeeeees
2014-09-18 21:03:46 -05:00
4b602c1b83
Inventory Update
...
added Jooq to Hub build
2014-09-19 10:36:41 +10:00
51ad6d8368
Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes
2014-09-18 17:33:05 -05:00
c7e0ebefd1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-13 20:52:13 -10:00
a395cae764
Fixes for Custom tag
...
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney
Added build files for arcade.
2014-09-13 20:50:27 -10:00
f3df86a5a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-14 14:10:51 +10:00
7e3b9b4b3a
some 1.8 title stuff
2014-09-14 14:10:40 +10:00
4f5430e390
Added tournament stuff.
2014-09-12 21:52:44 -10:00
a196e43fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
2014-09-12 19:46:19 -10:00
5e9cbcef75
Merge remote-tracking branch 'origin/master'
2014-09-12 23:15:58 -05:00
71f42c6e7b
Treasure updates
2014-09-12 23:15:53 -05:00
e511df4605
Merge treasure
2014-09-13 13:41:37 +10:00
e36f843feb
Fixed bug in MineStrike
2014-09-13 12:29:35 +10:00
f0fa3469df
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-13 09:17:50 +10:00
58f784187b
UHC Manager for Hub
2014-09-13 09:13:46 +10:00
14c4152248
Fixed CustomTagFix.
...
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
2014-09-12 10:03:33 -10:00
dea6c98fc9
Merge remote-tracking branch 'origin/master'
2014-09-12 14:08:22 -05:00
4ea786a1a5
Fix fireworks for 1.8 client, a bunch more treasure stuff
2014-09-12 14:08:10 -05:00
5de59b6e0e
Hub UHC countdown basics
...
UHC MOTD timer stuff
2014-09-12 18:06:51 +10:00
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
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
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
b691b1bad0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 12:51:59 +10:00
f6ce9abed8
Minestrike
...
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
2014-09-05 12:28:29 +10:00
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
e7f79aa5bf
Update IntelliJ files for latest changes
2014-09-03 11:42:50 -05:00
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
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
4dbe7003b2
Update Arcade Icon in the game menu
2014-09-02 21:09:12 -05:00
08e6b73b1f
Disable Treasure stuff for now
2014-09-02 19:04:43 -05:00
5905ef5ef7
Treasure Stuff
2014-08-30 14:27:11 -05:00
b07670f6af
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:04:32 -07:00
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
2c30cc3ef4
Implemented new servers flags
...
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
41daba98c4
Background work for Minestrike
...
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
fa56aa0843
Fixed regular players not able to join Beta servers.
2014-08-28 14:02:55 -07:00
5281558cdb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 14:01:49 -07:00
409e2c6141
Tweaked menus for quick game, Cosmetic menu.
...
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
ec4cb91a1c
Poll changes
...
Achievement output double space fix
2014-08-28 11:50:09 +10:00
b67e127902
Merge remote-tracking branch 'origin/master'
2014-08-27 14:08:47 -05:00
573f71164f
Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking
2014-08-27 14:07:22 -05:00
4e43a2ca73
Extended range of snake parkour, ensuring people tp back to it when they fall.
2014-08-27 15:19:08 +10:00
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
b508cd036c
Lazy fix so that polls award gems instead of coins
2014-08-26 18:36:40 -05:00
5fdf466722
Fixed bug in server monitor.
...
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07:00
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
162a86d4b2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
b8b6c031cd
Re-did and added a game to the quick game menu.
...
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
1b3e32ca26
Added Arcade Achievements
2014-08-26 14:42:17 +10:00
28d523d696
Added Achievements
2014-08-26 13:42:42 +10:00
Keir
Jonathan Williams
Cheese
Sarah
Shaun Bennett
Mysticate
libraryaddict
NewGarbo
Shaun Bennett
AlexTheCoder
Ty Sayers
Mini-Chiss
fooify
Aaron Brock
Ben Sihota
libraryaddict
CoderTim
MrTwiggy