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

172 Commits

Author SHA1 Message Date
Shaun Bennett
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
Shaun Bennett
c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Chiss
19d3bba461 fixed fence glitch in dom 2014-11-22 13:20:34 +11:00
Jonathan Williams
2c098e531a Added error catching for arcade configuration. 2014-11-07 02:14:34 -08:00
Jonathan Williams
f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams
1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Shaun Bennett
a47be7a2f6 Merge remote-tracking branch 'origin/master' 2014-10-19 00:08:13 -05:00
Shaun Bennett
1394e33056 Fix for Arcade Kit NPC Names in 1.8 2014-10-18 21:15:53 -05:00
Chiss
9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Jonathan Williams
c641eab3c7 Fixed up friends. 2014-10-03 01:50:23 -07:00
Shaun Bennett
c7d34e70ef Merge remote-tracking branch 'origin/master' 2014-09-29 17:42:13 -05:00
Shaun Bennett
7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
Chiss
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
Shaun Bennett
5d643c00d5 treasssssurreeeeees 2014-09-18 21:03:46 -05:00
Jonathan Williams
14c4152248 Fixed CustomTagFix. 
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
 2014-09-12 10:03:33 -10:00
Jonathan Williams
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
Jonathan Williams
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
Jonathan Williams
8198bb31c8 Added sneaking to player disguise. 
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
 2014-09-01 00:56:32 -07:00
Chiss
2c30cc3ef4 Implemented new servers flags 
Removed OP from Admisn in HUB, gave them /gm command instead
 2014-08-30 16:33:56 +10:00
Chiss
17649ce36c Fixed bug where desc for past-completed achievements was still showing 2014-08-26 21:51:59 +10:00
Jonathan Williams
137b8692e4 Added Gem booster use. 2014-08-26 00:33:48 -07:00
Jonathan Williams
70beb58bd6 Enabled debugging in Hub/Arcade 2014-08-23 01:49:48 -05:00
Chiss
231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Chiss
508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
Chiss
9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss
ff6ea3c798 Added Cosmetics to Arcade 
Set prices on cosmetics
 2014-08-09 19:55:05 +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
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
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Peter Miller
6c67ff9106 Resolving issues from Portal.java conflict resolution 2014-07-02 04:09:41 -04:00
Jonathan Williams
9514f6391e Fixed bug in Arcade with client manager. 2014-07-01 21:42:00 -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
Jonathan Williams
be8fea8ca9 Changed Chat API key. 
Fixed PreferenceManager not saving asynchronously.
 2014-06-12 08:02:47 -07:00
Chiss
661a869116 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-06-10 13:02:17 +10:00
Chiss
7fc2fbe564 Scoreboard Refactor 2014-06-10 12:51:47 +10: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
Chiss
4304327bf9 Disallowed /spec during games. 2014-05-03 13:06:15 +10:00
Chiss
1d4d98b910 Twitch Prep 
MAC changes
 2014-05-02 14:35:41 +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
47417dea6b Implemented initial SafeChat. 2014-04-27 21:59:18 -07:00
Chiss
5ac48a02fb Stripped indicator func out of Condition 
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
 2014-04-15 17:53:24 +10: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
2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams
bedabd84cc Added silence to kits (UtilEnt.silence) 
Cleaned up a ton of unused code....
 2014-04-08 23:31:32 -07:00
Chiss
85c57f2942 IButton now has Left/Right 
Added right-click skill removal.
 2014-04-06 12:45:52 +10: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
aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover. 
Fixed CustomBuild stuff.
 2014-03-27 22:17:31 -04:00
Jonathan Williams
efee9fdcbf Fixed Hub class shop. 
Added chat logging.
Added message with file updater.
 2014-03-13 17:56:05 -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
f2570caad5 Swapped default connections to new dns names. 
Fixed bug with LobbyBalancer and retrieving no lobbies.
 2014-02-21 13:32:14 -08:00
Chiss
6b577af7b4 Punish Update 
H&S Additions
 2013-11-07 15:25:46 +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
7b8608de95 Rah Rah, Custom Class Combat in Arcade! 2013-10-30 23:35:24 -07:00
Chiss
386e2e3067 Added Champs 
MAC update
 2013-10-31 09:45:11 +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
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
2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Jonathan Williams
1cdb89f4bf Derp, missing arcade. 2013-10-13 21:51:38 -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
b1744e86d8 many UHC bug fixes 
dragon escape bug fixes
barbarians bug fixes
death tag fixes
 2013-09-13 12:24:33 +10:00
Jonathan Williams
d5ef0208a1 Added lag meter to hub and arcade. 2013-09-03 23:31:29 -07:00
Jonathan Williams
8840f04977 Fixed FileUpdater. 
Added FileUpdater to DOM and Arcade.
 2013-09-02 04:19:56 -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
e17368a9ac >.< Updates 2013-08-31 13:15:16 +10:00
Jonathan Williams
3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00