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

2386 Commits

Author SHA1 Message Date
Chiss
dd61077850 Added missing Achievements 2014-08-26 14:46:10 +10:00
Chiss
1b3e32ca26 Added Arcade Achievements 2014-08-26 14:42:17 +10:00
Chiss
f0e01aa257 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 13:42:54 +10:00
Chiss
28d523d696 Added Achievements 2014-08-26 13:42:42 +10:00
Shaun Bennett
905d4db6f1 Use emerald instead of bed 2014-08-25 21:32:30 -05:00
Shaun Bennett
2e0b074053 More achievement gui changes 2014-08-25 20:56:21 -05:00
Chiss
07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
Chiss
0e3cf67402 Some new cosmetics 2014-08-25 12:59:29 +10:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Shaun Bennett
ff441f2262 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Chiss
642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00
Chiss
af9bf0727a Fixed damage taken stat NPE 
Added tournament team auto-rejoin
 2014-08-23 17:55:28 +10:00
Jonathan Williams
fd0c4745f8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-23 00:40:17 -05:00
Jonathan Williams
931cb5ece8 Removed MineKart code. 
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
 2014-08-23 00:40:07 -05:00
Chiss
0700b9df12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 15:04:55 +10:00
Chiss
3ec43f90e8 GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements 2014-08-23 15:04:43 +10:00
Jonathan Williams
a84468157c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 18:21:38 -05:00
Jonathan Williams
ebb4c44bdc Tweaked player disguise. 2014-08-22 18:21:23 -05:00
Chiss
9fad775f73 More cosmetics 2014-08-23 07:50:07 +10:00
Chiss
11597285b8 Changed so it music will never be 'active'. 2014-08-23 05:36:57 +10:00
Chiss
2e031f1e4a Added Music Gadget 2014-08-23 05:35:07 +10:00
Jonathan Williams
b67b2f04b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 13:32:50 -05:00
Jonathan Williams
13b90e1142 Preliminary work on help desk integration with Customer Support server. 
Updated DisguiseSheep with values from craftbukkit.jar
 2014-08-22 13:32:22 -05:00
Chiss
a159f04d50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 04:30:52 +10:00
Chiss
231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams
83b3e49151 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 10:48:27 -05:00
Jonathan Williams
70217fe957 Finished first release of Customer Support plugin. 2014-08-22 10:47:46 -05:00
Chiss
0022586e3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-22 17:08:29 +10:00
Chiss
97c087a28d Allowed commands to specify specific ranks 
allowed youtube/build to start/set games
 2014-08-22 17:05:14 +10:00
Jonathan Williams
99d15d3ece Work on Customer support server. 2014-08-21 15:55:09 -05:00
Jonathan Williams
830eeca835 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-20 20:14:32 -05:00
Chiss
60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Jonathan Williams
217ab51b40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 22:24:16 -05:00
Shaun Bennett
a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Jonathan Williams
24f984a365 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 21:37:11 -04:00
Jonathan Williams
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
Chiss
94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Jonathan Williams
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
Shaun Bennett
43fd604695 Queue up polls for players instead of constantly checking for next poll 2014-08-17 17:47:38 -05:00
Jonathan Williams
8aec9e345e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-16 01:37:17 -05:00
Jonathan Williams
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
Chiss
d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Chiss
a888d4f14b Fixed leaks 2014-08-16 15:39:02 +10:00
Ty
3c4c537998 Fix issue where broken Jedis instances were returned as functional instances. 2014-08-15 14:49:01 -04:00
Chiss
697897b967 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-15 09:49:12 +10:00
Chiss
85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +10:00
Jonathan Williams
846c75453c Revamping Redis Server status so it uses a consistent time value from redis database. 2014-08-14 07:41:04 -05:00
Jonathan Williams
cacf736f4f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-14 04:10:21 -05:00
Jonathan Williams
682735e994 Added build fixes for ServerMonitor.java 
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
 2014-08-14 04:10:11 -05:00
Chiss
74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Chiss
c72f4b6057 Dragon target cancel fix 2014-08-14 12:35:49 +10:00
Chiss
b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00
Chiss
7a3bba45a7 Mergey! 2014-08-14 10:32:41 +10:00
Jonathan Williams
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
Jonathan Williams
6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Ty
4b4f43ac16 Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section. 2014-08-13 16:37:05 -04:00
Ty
1bbb42214d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-12 11:14:53 -04:00
Ty
5b059e96ca Commit missing PortalRepository.java file and finish clean() method. 2014-08-12 11:14:31 -04:00
Chiss
95394c51cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-12 11:24:12 +10:00
Chiss
2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Ty
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
Shaun Bennett
d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett
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
Shaun Bennett
482b964580 Display particles when shouldDisplay() is true instead of false 2014-08-11 12:30:03 -05:00
Shaun Bennett
7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00
Chiss
02270a9d25 TNT effect only triggers off self tnt. 2014-08-11 15:33:45 +10:00
Chiss
e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +10:00
Chiss
06bcf5079b Disabled Gem hunter (bugged?) 
Disabled chicken morph letting people fly
 2014-08-10 18:36:18 +10:00
Chiss
25b525837f Fixed TNT blowing up lobby when it changed to prepare. 2014-08-10 11:07:05 +10:00
Chiss
9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss
3533ce1b7e Particles dont play in stealth games. 2014-08-10 01:04:53 +10:00
Chiss
53221e267e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-10 00:57:17 +10:00
Chiss
7aa017772f Spectators will not play particle effects 
ALL rank no longer displays on morphs.
 2014-08-10 00:55:51 +10:00
Jonathan Williams
e50c179e8d Fixed pet tag price. 2014-08-09 09:49:00 -05:00
Jonathan Williams
43862ea6bf Moved Particles to Admin and up only. 2014-08-09 09:44:00 -05:00
Chiss
21b89d2771 removed particle debug 2014-08-09 23:36:36 +10:00
Chiss
59859b168f Fixed multi-morphs 2014-08-09 23:34:12 +10:00
Jonathan Williams
3ea2567079 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 07:41:09 -05:00
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
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
c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -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
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
Chiss
de2b42e190 fixed tnt bug 2014-04-19 15:18:13 +10:00
Chiss
b720a6433c Explosions crack carved stone brick 2014-04-19 15:10:30 +10:00
Chiss
081da93bbd blocked /bukkit:me 2014-04-13 11:19:16 +10:00
Chiss
f25a6c26c9 Champs Update 2014-04-13 11:06:10 +10:00
Jonathan Williams
1cb35262ac Fixed skill tokens not being returned. 2014-04-12 14:02:40 -07:00
Jonathan Williams
8f42d91d8a Fixed ban kick bug. 
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.

Updated to 1.7.8 spigot support.

Removed logging on HS.
 2014-04-12 01:28:33 -07:00
Chiss
80df2c2944 Bux fixes for 1.7 
Champions TDM
SSM Domination
 2014-04-11 15:33:31 +10:00
Chiss
71b2931936 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-11 10:34:51 +10:00
Chiss
2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams
0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams
a26894fda6 Added missing file. 2014-04-09 21:38:12 -07:00
Chiss
85c57f2942 IButton now has Left/Right 
Added right-click skill removal.
 2014-04-06 12:45:52 +10:00
Jonathan Williams
ddcc8a26b3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-04 15:02:42 -04:00
Jonathan Williams
edfe23fb01 Fixed collision with Projectiles. 2014-04-04 15:02:13 -04:00
Chiss
13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss
26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss
80c153095b Cooldown bar 2014-04-02 22:03:56 +11:00
Chiss
2f0167ea09 Champs Update 2014-04-02 21:22:21 +11:00
Chiss
2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams
afc26e21e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 18:46:52 -04:00
Chiss
0f937b165c skill shop stuff 2014-03-30 09:45:53 +11:00
Jonathan Williams
d227a6bd06 Changed full server message 2014-03-29 18:45:44 -04:00
Chiss
fce249d7d8 fixed some desc stuff 
castle seige removed OP kit
 2014-03-28 18:50:38 +11:00
Chiss
f5ca6408f8 Merge? 2014-03-28 14:51:26 +11:00
Jonathan Williams
17e6658437 Fixed up AntiHack database reporting. 2014-03-24 01:16:02 -07:00
Jonathan Williams
8bf78fe14d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-21 15:30:06 -07:00
Jonathan Williams
33d342b049 updated 1.7 stuff. 2014-03-21 10:57:31 -07:00
Chiss
ab2a72ba16 CS Update 2014-03-21 11:59:56 +11:00
Jonathan Williams
f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Jonathan Williams
de1365b5cf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-13 17:56:16 -07:00
Jonathan Williams
efee9fdcbf Fixed Hub class shop. 
Added chat logging.
Added message with file updater.
 2014-03-13 17:56:05 -07:00
Chiss
82644002c5 A little bit o dem ol bug fixles. yknow what im sayin? 2014-03-13 16:32:48 +11:00
Jonathan Williams
a565da45e4 Added classes to champions. 
Added ability to open direct classes page.
 2014-03-09 19:32:27 -07:00
Jonathan Williams
f51a6747fd Moved files into Mineplex.core 
Removed references to Core project.
 2014-03-09 00:50:13 -08:00
Jonathan Williams
d99a3c9253 Optimized mysql queries with server status' address/updated fields. 
Removed double gems.
Added BETA check for Hero only beta games.
 2014-03-03 12:47:57 -08:00
Jonathan Williams
b3f10b9d62 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-01 01:59:25 -08:00
Chiss
bfaa138526 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-03-01 10:35:20 +11:00
Chiss
7cf6391ddd Sheep Quest 
Double Gem Weekend
 2014-03-01 10:35:06 +11:00
Jonathan Williams
8550307904 Removed unnecessary mysql call on client login. 2014-02-28 13:22:30 -08:00
Jonathan Williams
c2044f7e8a Added horse disguise. 
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.

Removed unnecessary region folder create in dominate.
 2014-02-28 01:18:32 -08:00
Jonathan Williams
f2570caad5 Swapped default connections to new dns names. 
Fixed bug with LobbyBalancer and retrieving no lobbies.
 2014-02-21 13:32:14 -08:00
Jonathan Williams
a75ced170c Added whitelist check in CoreClientManager 2014-02-10 02:04:20 -08:00
Chiss
e124dde006 Finished Gravity 
INcluded map
 2014-01-21 22:48:18 +11:00
Jonathan Williams
0fba94f8ae Derp 2014-01-20 20:22:59 -06:00
Chiss
76b2baf626 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-01-21 11:28:37 +11:00
Chiss
7bbfdd1a42 Gravity Update 2014-01-21 11:28:12 +11:00
Jonathan Williams
dea96a9e65 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-18 09:08:12 -06:00
Jonathan Williams
177f4a878b Removed bad eventhandler line 
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
 2014-01-18 09:02:56 -06:00
Chiss
75669e2333 Hub News Changes 
AntiHack Autokick for Severe Hackers
 2014-01-18 20:33:38 +11:00
Chiss
1031846198 SSM Update 
Gravity game start
 2014-01-18 12:34:24 +11:00
Jonathan Williams
ea320e7f5b Removed Client cleanup. 
Modified server monitor process handling.
 2014-01-08 15:18:52 -05:00
Jonathan Williams
6904f9cf3d Minor verbage "Starting in 1 Second." 
Fixed NPE in client cleanup.
 2014-01-03 05:50:05 -05:00
Jonathan Williams
93c0575fe2 Fixed naming in some hub modules. 
Fixed StatusManager ip and DynamicServer comparison.

Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
 2014-01-03 01:37:39 -05:00
Jonathan Williams
dd7b178a9f Fixed Hero rank in EnjinTranslator 2013-12-26 19:44:36 -05:00
Chiss
d92515eef9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-24 19:14:54 +11:00
Chiss
74e49a3ff1 Hero Rank stuff 
New SSM Kit
 2013-12-24 19:14:40 +11:00
Jonathan Williams
6595d33899 Tuned chunk load for disguise manager. 
Disabled dynamic text in hub.
 2013-12-24 00:39:33 -05:00
Jonathan Williams
79de7f2bfc Fixed portal breaking with Frost horse. 
Added memory clean up for disguises
 2013-12-23 04:16:53 -05:00
Chiss
c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Chiss
c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss
3ca67d60c0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-14 16:38:46 +11:00
Chiss
9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams
ac049e0397 FINE JUST FINE>>>>>> STUPID CHICKENS 2013-12-13 21:36:57 -08:00
Jonathan Williams
69fa9eaba5 Added getters for stats/StatsManager.java 2013-12-13 21:35:04 -08:00
Jonathan Williams
e054b06cc2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-13 21:01:08 -08:00
Jonathan Williams
6b92b6c4a8 Added stats manager. 
Added lots of missing files.
 2013-12-13 21:00:56 -08:00
Chiss
5f2e457362 Minor HG Stuffs ;o 2013-12-13 16:21:39 +11:00
Jonathan Williams
03627eb0c3 Changed all mysql connections to be persistent. 2013-12-06 01:57:09 -08:00
Chiss
0b7bf00ca7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-22 18:41:31 +11:00
Chiss
0a683416ff SG Update 2013-11-22 18:40:38 +11:00
Jonathan Williams
be7ea65033 Website bin/obj cleanup 
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.

Added ServerStatus for dedicated servers.
 2013-11-21 12:08:58 -08:00
Chiss
85a3edc75e Mute should now correctly block all command input too. 2013-11-17 11:04:54 +11:00
Jonathan Williams
39384470e7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-15 21:41:23 -08:00
Jonathan Williams
84acc952fa Added DisguiseCat. 
Added CookieTown Block Hunt.
 2013-11-15 21:41:14 -08:00
Chiss
29ce493f64 Hide and SEEEEEEK (block honts) 2013-11-15 18:52:46 +11:00
Jonathan Williams
115109e5b8 Added sound disguise for DisguiseBase 
Small desc tweak on server monitor.
 2013-11-14 00:01:41 -05:00
Jonathan Williams
980ce0a5a3 Block disguise velocity tweak. 2013-11-08 16:06:17 -08:00
Chiss
255307088c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
 2013-11-09 10:03:49 +11:00
Chiss
3c5b1fe74f H&S Updates 
some punish fixes
hub toggles no longer pulse on pressure plate
 2013-11-09 09:48:40 +11:00
Jonathan Williams
cae10fe7b4 Fixes to DynamicServer Monitor 
Fixed SSM disguise clunky movement.
 2013-11-08 10:52:56 -08:00
Jonathan Williams
7cc880afd1 ServerMonitor tweaks. 2013-11-07 00:22:04 -08:00
Chiss
8fa7b9f283 Helpers can use WARNINGS 2013-11-07 17:03:34 +11:00
Chiss
6b577af7b4 Punish Update 
H&S Additions
 2013-11-07 15:25:46 +11:00
Jonathan Williams
e0d10f6550 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 19:48:27 -08:00
Jonathan Williams
41e9ffb018 Removed BungeeSigns 
Updated Bungee plugin to pull US servers only.
Added dynamic MOTD from mysql for BungeeCord.jar

Fixed crash for disguise block arm animation.
 2013-11-06 19:48:00 -08:00
Chiss
9f11352f10 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 10:19:30 +11:00
Chiss
03731de7f8 Rank changes 
MAC no longer kicks lag/fly
some H&S stuff :O
 2013-11-07 10:18:36 +11:00
Jonathan Williams
9327e71519 MOre work on dynamic server baby! 2013-11-06 01:03:02 -08:00
Jonathan Williams
2064c58d1b Fixed up ServerStatusRepository to insert into specific columns 
Fixed Dominate shop.

Some work on Server Monitor
 2013-11-05 10:19:04 -08:00
Chiss
c72f1337e8 fixed memory leak in antihack 2013-11-01 10:40:33 +11:00
Chiss
386e2e3067 Added Champs 
MAC update
 2013-10-31 09:45:11 +11:00
Jonathan Williams
1781ed15c4 Fixed some drop item stuff. 2013-10-26 12:02:18 -05:00
Jonathan Williams
0b0fa383f6 Finished up Gadget shop. 2013-10-26 10:45:41 -05:00
Chiss
7eb1cc6519 Halloween game additions 2013-10-27 00:06:44 +11:00
Jonathan Williams
ca3979f4fa Added witch disguise hurt sound 2013-10-25 20:12:01 -05:00
Jonathan Williams
8883855297 Added witch disguise 
Added missing files.
 2013-10-25 19:05:26 -05:00
Chiss
e8ddfc266e fsd6gty72 tjn6g wgh 2013-10-25 22:20:46 +11:00
Jonathan Williams
e5f99331dd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 05:16:15 -05:00
Chiss
5563d94111 Halloween event update 
hub News
hub mounts
hub gadgets
 2013-10-25 19:20:14 +11:00
Jonathan Williams
21128eb153 Prepping filterChat and CoreClientManager for mysql 
Removed get all clients at server start.
 2013-10-23 16:36:13 -05:00
Chiss
1977572ced Added Halloween Minigame 
Updated gadgets and other minor things.
 2013-10-22 15:46:31 +11:00
Jonathan Williams
985ce795d2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-18 00:50:49 -07:00
Jonathan Williams
90fbc397ff Converted gem rewards to boolean return from website. 
Implemented gem transactions and source.
 2013-10-18 00:46:06 -07:00
Chiss
02258b9fd3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-18 09:12:19 +11:00
Chiss
882ede9a21 tp ah exception 2013-10-18 09:09:29 +11:00
Jonathan Williams
7e77f78d2f Removed all client list pull. 2013-10-17 00:54:14 -07:00
Jonathan Williams
43b42f771a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2013-10-17 00:40:06 -07:00
Jonathan Williams
f88c202e07 Added AntiHack to Arcade/Hub 
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
 2013-10-17 00:37:57 -07:00
Chiss
410e08b06a Clearer MAC reporting to staff 2013-10-17 09:05:03 +11:00
Chiss
4d6a0e2133 Ah no kick 2013-10-17 09:02:52 +11:00
Chiss
d9ecbf4037 AH Update 2013-10-17 09:01:36 +11:00
Chiss
d23f72567a fixed bug. 2013-10-16 17:22:28 +11:00
Chiss
9cdcbed086 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 12:24:02 +11:00
Chiss
2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Jonathan Williams
483f8ffde3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-15 14:20:45 -07:00
Jonathan Williams
1a5f6a9b74 Coreclient fix. 2013-10-15 14:18:13 -07:00
Chiss
40e49dd3d4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 08:11:04 +11:00
Chiss
ec80d8a568 added AntiHack 
added dragonrider coolness
 2013-10-16 08:10:45 +11:00
Jonathan Williams
c68bfce21a Fix for null pointer in core client cleanup 2013-10-14 12:20:49 -07:00
Jonathan Williams
922d269a52 Added core client cleanup in case of weird glitch from bungee 2013-10-13 22:40:06 -07:00
Jonathan Williams
6c568cb7a9 Added MemoryFix to Arcade 
Added Dipose override and task cancellation to Confirmationpage
Cleaned up unused code in Updater
 2013-10-13 21:51:25 -07:00
Chiss
230ad4aa7b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-14 10:29:48 +11:00
Chiss
9ffc793f61 added Dragon Rider 
anti-stack changes (dont anti-stack mined blocks)
 2013-10-14 10:29:20 +11:00
Jonathan Williams
1c1fb056a6 Memory leak fix for explosion blocks. 2013-10-13 01:27:41 -07:00
Chiss
a34b6da238 even less blocks 2013-10-13 09:20:00 +11:00
Chiss
bb39f18573 Explosion creates less blocks. 2013-10-13 09:18:49 +11:00
Jonathan Williams
e723075298 Increased lobby menu size. 
Fixed memory leak in Explosion
 2013-10-12 02:52:35 -07:00
Jonathan Williams
42b932e612 Added inventory move prevention for all inventories 
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
 2013-10-12 01:55:32 -07:00
Jonathan Williams
f2c295c391 Fixed global ultra joining full games. 2013-10-11 22:03:17 -07:00
Jonathan Williams
fc18d0fbb1 Added null check logging to arcade custom kit name. 
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
 2013-10-10 09:01:48 -07:00
Jonathan Williams
3999f80a79 Fixed Lobby balancer issue and null bungee connect. 
Optimized lobby balancing based on connects per second.

Added Pet deactivation.

Possibly fixed asynchronous pet spawning as well.
TODO : Realized we are doing a lot of async stuff....stupid jon jon.
 2013-10-08 02:22:04 -07:00
Jonathan Williams
1431961b39 Fixed issues with Pet menu. 
Fixed typo in Welcome Tutorial
 2013-10-05 00:59:45 -07:00
Jonathan Williams
f389378bd2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-10-04 23:57:58 -07:00
Jonathan Williams
4ed1d97a33 Added missing pet buttons. 2013-10-04 23:56:16 -07:00
Jonathan Williams
59d7a78086 Revamped pet purchase and added pet menu to player hotbar. 
Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.
 2013-10-04 23:55:05 -07:00
Chiss
ab45c717dd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-10-05 07:49:21 +10:00
Chiss
3ba848567c paintball added 
hg additions
minor changes to other games
 2013-10-05 07:49:05 +10:00
Jonathan Williams
57b0d06786 Added DisguiseWolf 
Added lobby menu (disabled autogive for testing)
Removed unused commands.
 2013-10-02 22:23:01 -07:00
Jonathan Williams
b6d33010ca - Lava parkour fire ticks are no more 
- Lava gem rewards on npcs reflect actual value (1000 and 4000)
- Can't carry people into parkour areas now

Removed unused code with Portal
Added portal functionality for server quick join
Disabled SG text
Updated quick game menu text.
 2013-09-27 12:40:09 -07:00
Jonathan Williams
b71ff09fb5 Fixed double server status manager in MK 
Fixed tps of 0.
Fixed couple bugs in Shop/Conf page.
 2013-09-26 21:18:31 -07:00
Chiss
064dd97d00 HitBox support for disguises 
Squid hitbox added
Changed squid swimming!
 2013-09-24 08:56:09 +10:00
Jonathan Williams
68e068092f Fix for ageable. 2013-09-23 15:09:52 -07:00
Jonathan Williams
6d5acd29db Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 
Conflicts:
	Plugins/Libraries/craftbukkit.jar
 2013-09-23 13:53:28 -07:00
Jonathan Williams
10994924c2 Fixes for Bungee lobby balancer. 
Exception handling in PlayerJoinEvents for hub (tracking a bug)
Fix in pages for shop.
Support eth1 private address setting in server status.

Fix for bug in ClientClass.
 2013-09-23 13:30:40 -07:00
Chiss
eae38dfa22 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Libraries/craftbukkit.jar
 2013-09-23 15:50:30 +10:00
Chiss
bf4dc35b5f Added pig Game 
added squid game
added recharged skill event
 2013-09-23 15:48:35 +10:00
Jonathan Williams
8aad215475 Added sheep color/shear for disguise 2013-09-22 21:12:08 -07:00
Jonathan Williams
e098d93155 Added baby disguise ability. 
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.

Code cleanup.
 2013-09-22 20:53:24 -07:00
Jonathan Williams
cc63fdccfc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-21 15:02:14 -07:00
Jonathan Williams
558d9b4cc6 Added shop link to kits. 
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
 2013-09-21 15:01:40 -07:00
Chiss
b3a78112be Fixed gem display bug 2013-09-21 13:53:12 +10:00
Chiss
9da18ea43f Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-21 08:34:24 +10:00
Chiss
a92c74a28a HG Updates 
Other minor fixes
 2013-09-21 08:34:07 +10:00
Jonathan Williams
85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Jonathan Williams
3622808e09 Fix for task cancelling. 2013-09-19 02:39:53 -07:00
Jonathan Williams
7329cc0aea Implemented quick game menu. 
Fixed dom team size at 1.

Removed old server update code from server manager.
 2013-09-18 22:11:49 -07:00
Jonathan Williams
978254c16c Fixed dominate start issues. 
Fixed issue with server status manager and config for server tracker.
Changed minekart mob name.

Updated Minekart with new server status stuff.
Updated Dominate with new server status stuff.
 2013-09-18 05:16:29 -07:00
Jonathan Williams
ae00d3df18 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-17 15:52:16 -07:00
Jonathan Williams
f31a734a0d Fixed server pages to show 5 servers. 
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.

Revamped bungee player count method.
Revamped server status method.
 2013-09-17 15:50:23 -07:00
Chiss
f280fb51f2 Mute now blocks commands too. 2013-09-17 14:54:50 +10:00
Chiss
34c333dac9 added announcement logging 
fixed creeper explosion disable for uhc
fixed player logout thing for UHC?
 2013-09-14 12:27:40 +10:00
Jonathan Williams
c976a46f1f Optimized UtilText/MapUtil.java 
Added quick game menu.  Still needs work.
 2013-09-13 15:25:01 -07:00
Chiss
b1744e86d8 many UHC bug fixes 
dragon escape bug fixes
barbarians bug fixes
death tag fixes
 2013-09-13 12:24:33 +10:00
Chiss
2a65086b70 Added Milk the Cow 
Maps now set Min/Max Y
 2013-09-12 08:57:51 +10:00
Jonathan Williams
0d98868a1f Fixed comparison issue in server page UI. 
Added DisguiseBlock for disguises.
 2013-09-09 18:42:20 -07:00
Jonathan Williams
0f577c3f8c Added ultra tag in hub. 2013-09-09 17:17:55 -07:00
Jonathan Williams
77a6c4c658 Fix for confirmation page NPE 2013-09-09 17:07:45 -07:00
Jonathan Williams
6b7b6c9fdf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2013-09-09 01:30:28 -07:00
Jonathan Williams
d4b3c5d461 Fixed memory leaks. 
Added in party joining for servers in Hub
Modified server status's in server UI.
 2013-09-09 01:28:35 -07:00
Chiss
9fe33bab84 Added UHC 
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
 2013-09-09 18:06:44 +10:00
Chiss
213b1efb0c Added Dragon Escape 
fixed kit availability for runner
SSM: wither skel projectile continues after releasing block
SSM: nerfed blizzard
SSM: reduced gem price of a few kits
 2013-09-06 15:58:58 +10:00
Chiss
768f57ae5e SSM: Added Wither Skeleton and Creeper kits 
Compass: no longer teleports if not holding compass (on click)
SSM: various balance changes.
 2013-09-05 13:55:42 +10:00
Jonathan Williams
9121d429c2 Added armor show/hide for insentient disguises. 2013-09-04 19:56:43 -07:00
Jonathan Williams
97405f6cfa Fixed NPE in SkillPage 
Added some timing debug text // for now
Changed utiltext setting method.
 2013-09-04 18:52:08 -07:00
Jonathan Williams
34dd5a1af3 Added broadcast command. 
Added Chat to hub.
Disabled /me
Fixed Pets not returning when pushed off into the void.
Prevented eggs from spawning in hub.
 2013-09-04 11:35:59 -07:00
Jonathan Williams
d5ef0208a1 Added lag meter to hub and arcade. 2013-09-03 23:31:29 -07:00
Jonathan Williams
b894aea72a Fixed login speeds. 
Implemented Tasks for Tutorial
Removed compiled files for website.
 2013-09-03 11:34:28 -07:00
Jonathan Williams
cec476c72d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 08:52:20 -07:00
Jonathan Williams
d16b674f46 Memory cleanup (Recharge, ClassCombatShop) 
Implemented Tasks.
 2013-09-03 08:51:44 -07:00
Chiss
83567fce50 SSM slime nerf 
disguise 0 velocity packet fix
 2013-09-03 10:47:15 +10:00
Jonathan Williams
74dba53e32 Fixed ignore update. 2013-09-02 16:24:04 -07:00
Jonathan Williams
5aec6509ca Fixed shop inventory loss bug. 
Added IgnoreUpdate.dat file check for testing with FileUPdater.
Fixed bug in SkillPage
Fixed bug in ClassCombatShop
Disabled dragon spawning in hub.
 2013-09-02 16:20:14 -07:00
Jonathan Williams
59f2b9ebc8 Memory cleanup with all MiniPlugins. 
Added Dragon.
Cleanup memory with Class Restore
 2013-09-02 05:37:33 -07:00
Jonathan Williams
8840f04977 Fixed FileUpdater. 
Added FileUpdater to DOM and Arcade.
 2013-09-02 04:19:56 -07:00
Jonathan Williams
d0098b8a46 Removed double jump effect for surrounding players in hub. 
Disabled Dragon spawning in HubManager.java(pending fix)
Fixed priority on MOTD for FileUPdater.
 2013-09-02 01:16:29 -07:00
Jonathan Williams
af7a41ae71 Implemented ServerRestart event on FileUpdate check. 
Implemented cancels in arcade/dom/mk
Implemented Restart updates in server manager page.

Implemented lobby removal is restarting.
 2013-09-02 01:09:28 -07:00
Jonathan Williams
63d2563f92 Added Disguise hurt sounds. 
Enabled disguised hurt sounds in DamageManager
 2013-09-01 23:28:07 -07:00
Jonathan Williams
a49f67b33c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 22:06:35 -07:00
Jonathan Williams
f0b0c72ddb Fixed arcade packethandler problem. 
Fixed skill page issue for class combat.
 2013-09-01 22:06:20 -07:00
Chiss
c483d869a5 Added SSM Spider and Squid Kit 
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
 2013-09-02 14:40:06 +10:00
Jonathan Williams
3041cacb26 Renamed disguise methods to lowercase. 2013-09-01 16:38:32 -07:00
Jonathan Williams
07ad83fa41 Added getDisguise 
Renamed new methods to lowercase.
 2013-09-01 16:35:17 -07:00
Jonathan Williams
181f3d4746 Added to DisguiseManager: 
-ReApplyDisguise
-UpdateDisguise
-IsDisguised
 2013-09-01 16:30:17 -07:00
Jonathan Williams
148c288d4f Fixed shop bug affecting server menu and class setup in hub. 2013-09-01 16:17:44 -07:00
Jonathan Williams
d14b21d29f Removed VoteHub.java 
Added commons codec to all build paths for Ant
Fixed pet shop new name.
Added send all for Portal.
Updated Hubmanager
 2013-08-31 20:28:35 -07:00
Jonathan Williams
e3fa648fc9 HUb minekart rider disguise.... 2013-08-31 02:01:41 -07:00
Jonathan Williams
c0198b1b1f Fixed vegetate...derp. 2013-08-31 01:36:40 -07:00
Jonathan Williams
0f4facd407 whitespace gone. 2013-08-31 01:29:52 -07:00
Jonathan Williams
e530e3b5a8 Fix for npc vegetate. 2013-08-31 01:29:32 -07:00
Chiss
81f8503180 Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2013-08-31 13:41:58 +10:00
Chiss
e17368a9ac >.< Updates 2013-08-31 13:15:16 +10:00
Jonathan Williams
13110356aa Added Enjin Translator poll ability. 
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
 2013-08-30 16:37:21 -07:00
Jonathan Williams
90de0c3ed2 Added LobbyBalancer for BungeeCord 
Added EnjinTranslator for automatic shop.
Removed enjin module from Hub
Tweaked donation/punish/accountadministrator for shop automation.
 2013-08-30 01:36:55 -07:00
Jonathan Williams
bb2af17856 Cleaned up files. 2013-08-30 01:26:12 -07:00
Chiss
8559e77a24 "UPDATES!"loooooooool 2013-08-29 16:13:05 +10:00
Jonathan Williams
a1d622c790 Tweaked disguise movement to cut out jitters. 2013-08-28 15:00:39 -07:00
Jonathan Williams
cb48c2a037 Test for git push. 2013-08-27 16:47:58 -07:00
Jonathan Williams
c9dd8d87eb Fixed DOm crash issue on game start. 
Added Teleport to Hub
Fixed DisguiseManager bleeding over.
Fixed Teleport sub commands
 2013-08-27 16:03:04 -07:00
Jonathan Williams
3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00