JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,366 Commits 1 Branch 0 Tags 481 MiB
99951bc573
Commit Graph

464 Commits

Author SHA1 Message Date
Jonathan Williams
9b75ef4f96 Fixed purchasing -2 cost gadgets. 2014-08-09 07:41:00 -05:00
Chiss
066dfbc9a9 Morph helmet fix 2014-08-09 22:38:58 +10:00
Chiss
e558796268 fixed TNT not being able to hit anyone 2014-08-09 22:16:49 +10:00
Chiss
a34ce75252 price fix 2014-08-09 22:02:40 +10:00
Chiss
6c847e78b7 Gem Hunter exp change 2014-08-09 20:16:21 +10:00
Chiss
06a444bae6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:55:35 +10:00
Chiss
ff6ea3c798 Added Cosmetics to Arcade 
Set prices on cosmetics
 2014-08-09 19:55:05 +10:00
Jonathan Williams
b0f6435661 Fixed items not updating immediately. 2014-08-09 04:29:34 -05:00
Chiss
951e1df3d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:05:34 +10:00
Jonathan Williams
8fe4e39207 Split up Cosmetic shop and Inventory 
Added Ammo purchase for item gadgets.
 2014-08-09 03:57:56 -05:00
Chiss
62eccbcc1e Snr Mod 
Creeper knockbak changes
 2014-08-09 15:06:00 +10:00
Chiss
91a79f0345 Pig Morph 
Morphs have tags/
 2014-08-09 14:57:01 +10:00
Jonathan Williams
3f54881a3e Fixed multiple purchase of Gem Booster. 2014-08-08 23:06:16 -05:00
Jonathan Williams
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
Chiss
db90bcc958 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 12:16:53 +10:00
Chiss
313f675ae4 Hub Parkour update 
Smash kit prices
 2014-08-09 12:16:37 +10:00
Jonathan Williams
e7847cc495 Tweaked Gem booster description. 2014-08-08 20:50:07 -05:00
Jonathan Williams
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
Ty
ecb0b2d3bb Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL. 2014-08-08 17:35:37 -04:00
Chiss
02dd579844 Text change for Inventory Menu 2014-08-08 17:16:20 +10:00
Jonathan Williams
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
Jonathan Williams
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
Chiss
fa3695be4e Gem Booster In Lobby 
Achievement Stuff
 2014-08-08 17:05:11 +10:00
Chiss
8f72ba4ab7 Hooked in statchangeevent 2014-08-08 13:53:58 +10:00
Chiss
1a33dbb5ee Achievement Module 
Gem Booster/Achivement
 2014-08-08 13:46:35 +10:00
Jonathan Williams
e051c1d62c Work on inventoryManager and Enjin translator. 2014-08-07 21:22:18 -05:00
Jonathan Williams
5d89d1f728 Fixed gadget adding/removing from hotbar 
Fixed stats manager _stats not initializing
Optimized saving call.
 2014-08-07 01:46:10 -07:00
Jonathan Williams
2a31bbee95 Added new gadget stuff to core. 
Hooked up particle page.
 2014-08-07 01:20:19 -07:00
Jonathan Williams
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
Jonathan Williams
055e4c5895 Converted PreferencesManager to RepositoryBase 2014-08-07 00:43:54 -07:00
Jonathan Williams
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
Chiss
c8dfb2f02e Parser Fixes 
Sneaky Stuff
 2014-08-06 11:07:49 +10:00
Ty
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
CoderTim
39e23c16f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 00:00:12 -04:00
CoderTim
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
Shaun Bennett
6d7e8072d5 Remove premium server restriction in ServerCommand 2014-08-03 13:41:14 -05:00
Ty
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
Jonathan Williams
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
Shaun Bennett
c2b1f2a52f Deny joining Premium servers through server command without premium 2014-07-31 13:47:51 -05:00
Peter Miller
fb0469adfa Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak. 2014-07-30 20:09:58 -04:00
Shaun Bennett
dcc8eaaa21 Add Server Menu for Premium Servers. Item lore still needs some work 2014-07-30 17:19:51 -05:00
Jonathan Williams
1362deca59 More work on FriendManager 2014-07-19 13:56:21 -07:00
Jonathan Williams
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
Jonathan Williams
8b747a81e1 Fixed filter bypass 2014-07-19 13:53:14 -07:00
Jonathan Williams
3636255e8a Fixed bug with DisguiseManager undisguising players. 
Temp fix for emeralds not triggering in Perk Revealer.
 2014-07-14 23:48:34 -07:00
Jonathan Williams
1207ed8199 Added DDOSProtectionSwitcher email functionality 
mineplex.core.Server cleanup.

Refactored RepositoryBase.

Implemented core functionality of Friends
 2014-07-14 22:58:36 -07:00
Peter Miller
58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Jonathan Williams
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
Peter Miller
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
a66e877028 Cleaned up Bungee mineplexer a bit. 
Refactored send/server commands for Portal.
 2014-07-05 10:56:20 -07:00
Jonathan Williams
c882ab1b34 Fixed portal command stuff. 
Removed temp code from PlayerTracker

Added temp project for future ddos prot switching.
 2014-07-04 23:23:19 -07:00
Jonathan Williams
e6666932aa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 14:32:41 -07:00
Jonathan Williams
c265c7ce5c Fixed sync db Logger.java 
Added temp test code in player tracker...ignore.

fixed bug in dynamic server sorter.
 2014-07-04 14:23:11 -07:00
CoderTim
2fb2aadf66 Merge remote-tracking branch 'origin/master' 2014-07-04 11:12:52 -04:00
Peter Miller
b56855c33c Squished remaining concurrency/checking bugs! Happy 4th o'July! 2014-07-04 02:19:20 -04:00
Jonathan Williams
d2caf23ed7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-03 11:19:23 -07:00
Jonathan Williams
b058665e93 Fixed sync db calls for PlayerTracker 
Fixed name update with new UUID

Skeleton work for Friends
 2014-07-03 11:18:11 -07:00
Peter Miller
2531dd7a8f Implementing user/serverName checks 2014-07-03 00:17:49 -04:00
Jonathan Williams
d0fafce585 Reverted change to helper only joining full, now ultras can. 
Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
 2014-07-02 16:59:31 -07:00
Mini-Chiss
558f79fe34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-02 10:58:34 -07:00
Mini-Chiss
17c36026f6 fixed bug where player who comes first was not being added to ranks. (get nothing) 2014-07-02 10:57:30 -07:00
Peter Miller
e7832fd06c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
 2014-07-02 03:47:14 -04:00
Peter Miller
1f515565ff Moving improved server/send command code to separate command files 2014-07-02 03:24:48 -04:00
CoderTim
44a57a485f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 21:39:03 -04:00
Jonathan Williams
41c4d5a0a8 Changed joining full servers to helper+ 2014-07-01 18:33:33 -07:00
Jonathan Williams
6fd889d8fc Added Player mapping. 
Removed joining full servers for ultra.
 2014-07-01 18:31:17 -07:00
Jonathan Williams
b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams
9fd3f14248 Added RankUpdate command. 
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
 2014-07-01 10:23:22 -07:00
CoderTim
7ea818c0c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 02:20:45 -04:00
Mini-Chiss
7bc3966feb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-30 16:13:15 -07:00
Mini-Chiss
8c461b3e1b Cooldown on Spec Compass 
Hub Forcefield Update
Scoreboard MINEPLEX refactor
 2014-06-30 16:12:42 -07:00
Jonathan Williams
8e8e66f8c1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 20:25:09 -07:00
Jonathan Williams
0287cfb2f6 Refactored Punish a bit so punishments don't expire early or jack up based on server's time. 2014-06-27 20:24:44 -07:00
CoderTim
ccb17d5ac3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 19:33:34 -04:00
Peter Miller
60a6f22194 Added functionality for retrieving serverName from Bungee 2014-06-27 17:01:54 -04:00
Jonathan Williams
210264f25b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 20:53:39 -07:00
Peter Miller
e25101cd59 Continued enhancements... 2014-06-25 20:28:27 -04:00
Jonathan Williams
f6ad5c5549 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 12:07:49 -07:00
Jonathan Williams
4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Peter Miller
bb5aa8e0f3 Work on /server and /send commands with permissions (more permissions need to be implemented). 2014-06-24 22:34:17 -04:00
Mini-Chiss
46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams
93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -07:00
Jonathan Williams
0f7885d911 Added safety checks in ClientManager 
Added logging and teampreference swap fix in arcade.
 2014-06-15 16:25:32 -07:00
Jonathan Williams
336c307732 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-12 08:03:02 -07:00
Jonathan Williams
be8fea8ca9 Changed Chat API key. 
Fixed PreferenceManager not saving asynchronously.
 2014-06-12 08:02:47 -07:00
Peter Miller
01fbda81ba More suggested improvements; commented out getEntries method for now. 2014-06-11 02:35:44 -04:00
Peter Miller
63f082b424 Implementing suggested code style/locking changes and recommitting (JIRA-76) 2014-06-10 16:09:33 -04:00
Jonathan Williams
0bf702902e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-08 11:28:25 -05:00
Jonathan Williams
3ae119d88a Fixed hub package unlock bug. 
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
 2014-06-08 11:27:14 -05:00
Peter Miller
77dad4b475 JIRA-76: SimpleStats Manager/Repository creation 2014-06-06 09:52:26 -04:00
Chiss
a8dda4ef8b Hub Gem Queueing 2014-06-04 13:02:16 +10:00
Chiss
f2d1709adb Hub update 2014-06-01 18:18:58 +10:00
Jonathan Williams
461e1023e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-06-01 00:39:28 -07:00
Jonathan Williams
f157715174 Merged Pet page into Gadget page. 
Reworked gadget page.
 2014-06-01 00:39:10 -07:00
Chiss
37c5654e13 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2014-06-01 15:50:11 +10:00
Chiss
a3a3a87278 Hug update 2014-06-01 15:47:34 +10:00
Jonathan Williams
7f87043f7b Removed unused buttons. 
Fixed pref inv placement.

Refactored queue code so its not stupid.

Fixed issue with queuer.
 2014-05-31 22:46:43 -07:00
Jonathan Williams
6505819a4b Removed chat filtering. 
Implemented user preferences in all required modules.
 2014-05-30 13:34:55 -07:00
Jonathan Williams
57c3845df9 Finished up preferences. 
Each preference saves, loads on login.
GUI working great.
 2014-05-30 01:42:43 -07:00
Jonathan Williams
77f6aac860 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-30 00:26:34 -07:00
Jonathan Williams
b8908ada4b Removed unused connection info in RetrieveClientInformationEvent 
Added required method for miniclientplugin
Implemented Preferences module...repo/manager/gui
 2014-05-30 00:25:48 -07:00
Chiss
937f5d8ef2 Hub stuff 2014-05-30 17:17:53 +10:00
Jonathan Williams
c38e60456b OMG THIS THING IS SO COMPLICATED MY BRAIN FIZZZLED...fixed some queuer issues. 
Fixed bug with forcefield in hub.

Fixed symbol for connecting to dbs in connection strings.
 2014-05-29 19:47:57 -07:00
CoderTim
fbf59ace67 Fixed server status connection url 2014-05-28 19:13:10 -04:00
CoderTim
1b5b2d21b2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-28 17:51:38 -04:00
Jonathan Williams
0d350da6c0 Added more files and updated ignore list. 2014-05-28 11:23:32 -07:00
Jonathan Williams
d5ea6c5377 Removed dead project ServerStatus 
Tweaked connection strings so they autoreconnect.

Added dragon sound to pre-queue prompt.

Added rest of missing files.
 2014-05-28 11:18:30 -07:00
Jonathan Williams
24ccf133af Fixed bug with Portal where it continuously sent players until queue cleaned up records 15 seconds later. 2014-05-28 10:43:39 -07:00
CoderTim
94e31e36f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-27 21:42:01 -04:00
CoderTim
e101c027ce Created Sneaky Assassins and started work on the kits 2014-05-27 21:38:22 -04:00
CoderTim
091166f090 Refactored disguises to use EntityType 2014-05-27 17:49:45 -04:00
Jonathan Williams
449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	.gitignore
 2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer. 
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
 2014-05-27 02:10:29 -07:00
CoderTim
49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim
c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Peter Miller
e0dd0116a2 Beginning changes for stats from PlayerName to PlayerUUID 2014-05-06 17:06:19 -04:00
Jonathan Williams
a9d3d31339 Fixed memory problem with CraftingManager and arcade worlds that should be unloaded but are still referenced. 2014-05-06 09:14:31 -07:00
Jonathan Williams
56c0545659 Added elo files. 2014-05-06 09:08:22 -07:00
Jonathan Williams
8110506ac4 Fixed duplicate login issue with CoreClientManager 
Added EloRanking and EloStart for elo games in Game.java

Refactored Elo code in Arcade to be based off of above values in Game

Changed Lobby scoreboard in Arcade to just Players at top current/max.
 2014-05-06 09:06:39 -07:00
Jonathan Williams
2f397e7d2a Work on elo manager. 
implemented coreclient cleanup.
 2014-05-04 22:40:44 -07:00
Jonathan Williams
97e083c1e7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-04 12:52:14 -07:00
Jonathan Williams
f623026dfc Fixed projectile order issue..check for dead before collision. 
Fixed dead chunks in Aracde.
 2014-05-04 12:52:04 -07:00
Chiss
3c2fc4c49b Fixed MAC not being disabled 2014-05-03 17:29:55 +10:00
Jonathan Williams
0101531291 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2014-05-02 23:15:08 -07:00
Jonathan Williams
484ba97b23 Updated file delete mechanism so there is no reflection. 
Removed list block on deleting players from coreclient quit.
 2014-05-02 23:12:39 -07:00
Chiss
4304327bf9 Disallowed /spec during games. 2014-05-03 13:06:15 +10:00
Chiss
395a5d2c08 MAC disabled with Tournament Mode 
Bridges TM game desc fix
 2014-05-03 11:47:15 +10:00
Chiss
1d4d98b910 Twitch Prep 
MAC changes
 2014-05-02 14:35:41 +10:00
Chiss
c1360c63f0 More strikes for auto-kick 
Updated MAC kick message
 2014-05-01 09:38:37 +10:00
Chiss
a17c1aca44 Allow more for lag in MAC 2014-05-01 09:36:30 +10:00
Chiss
8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2014-05-01 09:33:59 +10:00
Chiss
423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams
f4a92ec07a Implemented Logger 
Logger now catches all uncaught exceptions and logs them to DB.

Put in some preventative checks in Hub/Party as they threw a lot of the same errors.

Added autoreconnect to AntiHack as it was spamming errors in DB
 2014-04-30 10:57:19 -07:00
Jonathan Williams
7637d94ae0 Added mysql logger. 
Hooked it up in a few places.

Fixed Asynch crap with AntiHack.
 2014-04-30 00:31:22 -07:00
Jonathan Williams
42e9fe879c Fix for party filtered party messages going to everyone. 2014-04-29 13:45:38 -07:00
Jonathan Williams
e958a922fe Fixed Hub chat so it goes through filter. 
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
 2014-04-29 12:53:22 -07:00
Jonathan Williams
cee2883786 Added some verbage around command center block. 
Fixed async chat connection stuff.
 2014-04-29 12:13:32 -07:00
Jonathan Williams
3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -07:00
Jonathan Williams
1bcdc71c14 Added ping logging to Antihack reports. 2014-04-28 01:53:02 -07:00
Jonathan Williams
fd372b8418 Changed skills to 2k gems each. 
Changed power/booster to 2k gems each.

Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
 2014-04-28 01:05:08 -07:00
Jonathan Williams
66aa7223cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-27 21:59:35 -07:00
Jonathan Williams
47417dea6b Implemented initial SafeChat. 2014-04-27 21:59:18 -07:00
Chiss
77809b409d MAC Update 2014-04-28 12:28:48 +10:00
Jonathan Williams
7c9017f184 Fixed Bungee issue with ServerPing in MOTD. 
UPdated to latest spigot again.

Removed useless 1.7 stat tracking.

Fixed Party issue in hub
 2014-04-26 02:47:04 -07:00
Jonathan Williams
9136fa0b15 Upgraded to latest spigot. 
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
 2014-04-25 00:44:14 -07:00
Chiss
b8e573e8f8 redid capture display. much less annoying. 2014-04-21 11:15:49 +10:00
Jonathan Williams
458f5741d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-19 20:54:04 -07:00
Jonathan Williams
e5e9cc7284 Custom Items in custom Builds for dom. 2014-04-19 20:53:55 -07:00