217ab51b40
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 22:24:16 -05:00
a7bb84be0b
Revert chris' revert
2014-08-19 21:24:49 -05:00
f60a818e6a
Update craftbukkit to remove the extra _INVALID mappings
2014-08-19 21:22:04 -05:00
24f984a365
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:37:11 -04:00
9ee25c6292
Did some cleanup in Pvp project.
...
Did work in Coreclient manager and added StaffServer (still in progress)
2014-08-19 21:36:23 -04:00
94e5eb03da
Fixed errors for new getPlayers method.
2014-08-20 10:43:56 +10:00
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
d73ffcccfd
Added performance logging in ServerMonitor
...
Added date tracking for gem/coin/account transactions in preparation for Customer Support server.
2014-08-18 15:46:23 -04:00
43fd604695
Queue up polls for players instead of constantly checking for next poll
2014-08-17 17:47:38 -05:00
8aec9e345e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-16 01:37:17 -05:00
df97873d32
Fixed index issue with lobby balancer
...
Added performance output for server monitor.
Removed logging of debug stuff.
2014-08-16 01:37:06 -05:00
d8123795aa
changed the way disguises show rank.
2014-08-16 16:33:18 +10:00
a888d4f14b
Fixed leaks
2014-08-16 15:39:02 +10:00
ae6cb4aa22
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 15:56:44 -04:00
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
3c4c537998
Fix issue where broken Jedis instances were returned as functional instances.
2014-08-15 14:49:01 -04:00
697897b967
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-15 09:49:12 +10:00
85522cddca
Debug (will clean once fixed)
...
Game stats
2014-08-15 09:49:00 +10:00
846c75453c
Revamping Redis Server status so it uses a consistent time value from redis database.
2014-08-14 07:41:04 -05:00
cacf736f4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-14 04:10:21 -05:00
682735e994
Added build fixes for ServerMonitor.java
...
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
2014-08-14 04:10:11 -05:00
74435bac12
fixed bug where players kept inventory open, to be able to enable morphs ingame.
2014-08-14 17:31:14 +10:00
c72f4b6057
Dragon target cancel fix
2014-08-14 12:35:49 +10:00
b21ae8ef72
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-14 10:32:52 +10:00
7a3bba45a7
Mergey!
2014-08-14 10:32:41 +10:00
27032ac2ed
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/portal/PortalRepository.java
2014-08-13 18:59:59 -05:00
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
4b4f43ac16
Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.
2014-08-13 16:37:05 -04:00
1bbb42214d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-12 11:14:53 -04:00
5b059e96ca
Commit missing PortalRepository.java file and finish clean() method.
2014-08-12 11:14:31 -04:00
95394c51cc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-12 11:24:12 +10:00
2d67d4ce36
Achievement fix + active
2014-08-12 11:23:53 +10:00
36d6a58e0a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-11 15:39:56 -04:00
d63137ead2
Merge remote-tracking branch 'origin/master'
2014-08-11 12:44:28 -05:00
4006c454c3
Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page)
2014-08-11 12:39:26 -05:00
482b964580
Display particles when shouldDisplay() is true instead of false
2014-08-11 12:30:03 -05:00
7e93ed657f
Display boss bar properly while a dragon mount is spawned in arcade
2014-08-11 12:26:56 -05:00
02270a9d25
TNT effect only triggers off self tnt.
2014-08-11 15:33:45 +10:00
e4871c4988
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
2014-08-11 11:55:00 +10:00
06bcf5079b
Disabled Gem hunter (bugged?)
...
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
25b525837f
Fixed TNT blowing up lobby when it changed to prepare.
2014-08-10 11:07:05 +10:00
9057246ab8
Arcade Inventory fixes
2014-08-10 10:50:31 +10:00
3533ce1b7e
Particles dont play in stealth games.
2014-08-10 01:04:53 +10:00
53221e267e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-10 00:57:17 +10:00
7aa017772f
Spectators will not play particle effects
...
ALL rank no longer displays on morphs.
2014-08-10 00:55:51 +10:00
e50c179e8d
Fixed pet tag price.
2014-08-09 09:49:00 -05:00
43862ea6bf
Moved Particles to Admin and up only.
2014-08-09 09:44:00 -05:00
21b89d2771
removed particle debug
2014-08-09 23:36:36 +10:00
59859b168f
Fixed multi-morphs
2014-08-09 23:34:12 +10:00
3ea2567079
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 07:41:09 -05:00
9b75ef4f96
Fixed purchasing -2 cost gadgets.
2014-08-09 07:41:00 -05:00
066dfbc9a9
Morph helmet fix
2014-08-09 22:38:58 +10:00
e558796268
fixed TNT not being able to hit anyone
2014-08-09 22:16:49 +10:00
a34ce75252
price fix
2014-08-09 22:02:40 +10:00
6c847e78b7
Gem Hunter exp change
2014-08-09 20:16:21 +10:00
06a444bae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:55:35 +10:00
ff6ea3c798
Added Cosmetics to Arcade
...
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
b0f6435661
Fixed items not updating immediately.
2014-08-09 04:29:34 -05:00
951e1df3d5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:05:34 +10:00
8fe4e39207
Split up Cosmetic shop and Inventory
...
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
62eccbcc1e
Snr Mod
...
Creeper knockbak changes
2014-08-09 15:06:00 +10:00
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10:00
3f54881a3e
Fixed multiple purchase of Gem Booster.
2014-08-08 23:06:16 -05:00
6bd9273edf
Refactored getting item count for ClientInventory
...
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
2014-08-08 22:10:02 -05:00
db90bcc958
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 12:16:53 +10:00
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10:00
e7847cc495
Tweaked Gem booster description.
2014-08-08 20:50:07 -05:00
bed2545b04
Added back buttons for sub menus.
...
Added Gem booster pack and booster count display.
Added reason and admin to mute message
Fixed inventory tracking.
2014-08-08 20:48:15 -05:00
ecb0b2d3bb
Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL.
2014-08-08 17:35:37 -04:00
02dd579844
Text change for Inventory Menu
2014-08-08 17:16:20 +10:00
e1be732202
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
2014-08-08 02:07:20 -05:00
9f2a83c956
Added Coins to donation.
...
Fixed order of gadgets, mounts, pets, morphs, particles.
Fixed display of active pet in Menu
Fixed coins purchase for most items.
Added Coins reward for ENjinTranslator.
Added Coin transactions.
2014-08-08 02:05:58 -05:00
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10:00
8f72ba4ab7
Hooked in statchangeevent
2014-08-08 13:53:58 +10:00
1a33dbb5ee
Achievement Module
...
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
e051c1d62c
Work on inventoryManager and Enjin translator.
2014-08-07 21:22:18 -05:00
5d89d1f728
Fixed gadget adding/removing from hotbar
...
Fixed stats manager _stats not initializing
Optimized saving call.
2014-08-07 01:46:10 -07:00
2a31bbee95
Added new gadget stuff to core.
...
Hooked up particle page.
2014-08-07 01:20:19 -07:00
c01fbd279d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
055e4c5895
Converted PreferencesManager to RepositoryBase
2014-08-07 00:43:54 -07:00
6d86f403ac
Added coins Currency to web api
...
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager
Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
1b7c762942
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-04 18:47:49 -04:00
39e23c16f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 00:00:12 -04:00
ec48a59301
Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.
2014-08-03 23:59:10 -04:00
6d7e8072d5
Remove premium server restriction in ServerCommand
2014-08-03 13:41:14 -05:00
6a9255e97b
Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.
2014-08-01 17:56:29 -04:00
53ce70488f
Merge pull request #1 from premium-server-menu to master
...
* commit '95a45409a98c141a115e463e56e440b204ae2029':
Use UtilPlayer and F.main for messaging
Fix flashing clock (oops!)
Sound effects and knockbacks!
Flashing wool instead of clock for the timer
Change duration of timer. Don't punish a party if the leader has ultra
Lighten load on our servers, not free servers!
Lore edit on clock item
Place players on correct server corresponding to their rank via portals
Visual clock update
Fix lore messages not displaying correctly under certain circumstances
Use constants for lore messages on server page
Prevent free players from joining servers before time limit
Deny joining Premium servers through server command without premium
Fix "Click to Spectate" formatting
Identify free servers from server name
Add Server Menu for Premium Servers. Item lore still needs some work
2014-08-01 02:05:39 -05:00
c2b1f2a52f
Deny joining Premium servers through server command without premium
2014-07-31 13:47:51 -05:00
fb0469adfa
Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak.
2014-07-30 20:09:58 -04:00
dcc8eaaa21
Add Server Menu for Premium Servers. Item lore still needs some work
2014-07-30 17:19:51 -05:00
1362deca59
More work on FriendManager
2014-07-19 13:56:21 -07:00
2ae3d89496
Fixed issue with RepositoryBase and Friend/MysqlRepo
...
Each db call on login gets its own async after the first two account calls are finished.
2014-07-19 13:56:03 -07:00
8b747a81e1
Fixed filter bypass
2014-07-19 13:53:14 -07:00
3636255e8a
Fixed bug with DisguiseManager undisguising players.
...
Temp fix for emeralds not triggering in Perk Revealer.
2014-07-14 23:48:34 -07:00
1207ed8199
Added DDOSProtectionSwitcher email functionality
...
mineplex.core.Server cleanup.
Refactored RepositoryBase.
Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
58092c914a
Initial database access and method stubbing for "news" command.
2014-07-08 22:55:51 -04:00
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
e6e86c2042
Updated DnsMadeEasy api.
...
Cleaned up some bungee code.
Added InternetStatus to Bungees.
Fixed some portal stuff.
2014-07-08 12:20:19 -07:00
ddf1a8ff74
Pointed "send" command to "AddTransferRecord" method in Portal module.
...
Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message.
Cleaned up unnecessary references.
2014-07-07 17:30:03 -04:00
Jonathan Williams
Shaun Bennett
Chiss
CoderTim
Ty
Peter Miller