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

117 Commits

Author SHA1 Message Date
Jonathan Williams
91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Jonathan Williams
f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Mini-Chiss
643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
Jonathan Williams
b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Jonathan Williams
fa4466b6a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-05-01 00:13:39 -05:00
Jonathan Williams
d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05:00
libraryaddict
9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-04-22 03:45:59 +12:00
Cheese
ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
libraryaddict
52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
Cheese
73c66fa93f Merge branch 'SpecRemoveCreative' 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-17 14:57:17 +11:00
Cheese
420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Cheese
c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Jonathan Williams
5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
libraryaddict
56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
libraryaddict
d29b43d645 Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages. 2015-02-17 15:17:14 +13:00
libraryaddict
9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
libraryaddict
29f3241098 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7 Add commands /ignore and /unignore. Fixed mutes not working with private messaging 2015-02-10 02:31:33 +13:00
Shaun Bennett
ed8638ae9f Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it 2015-02-06 23:39:22 -05:00
libraryaddict
505dcc1e8e Add friends gui, deprecate the old chatbased friends display 2015-01-30 13:46:07 +13:00
Jonathan Williams
08078c1622 Removed Logger 2015-01-22 23:18:38 -08:00
Jonathan Williams
8e04a2a5f2 Portal now checks server status and player's rank before sending them to a server to prevent login spam. 
Refactored portal method names.
 2015-01-11 00:42:31 -08:00
Jonathan Williams
97f57b655b Prevent horses from spawning in Clans 
Added Building supplies shop and pvp shop to clans.
 2014-12-29 06:44:00 -05:00
Jonathan Williams
0e85b7e6cc Added HostName to server groups. 
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
 2014-12-23 00:49:52 -05:00
Jonathan Williams
5b67e2182a Added disguise to Pet Manager for eventual wither disguised pet. 2014-12-14 02:30:39 -05:00
Chiss
0aba82eee6 fixed some eclipse java6 stuff with mail 
Christmas game update
 2014-12-10 15:38:57 +11:00
Shaun Bennett
f48085d5ca Merge remote-tracking branch 'origin/master' 2014-12-04 17:41:40 -06:00
Jonathan Williams
abaf9f4693 Refactored IRelation method names 
Added support for negative amounts in Support server.

Clans in core testing state.
 2014-12-03 13:06:50 -08:00
Jonathan Williams
f507db7664 Reworked spawn to save to database. 
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
 2014-11-29 03:16:37 -08:00
Shaun Bennett
cded2c7d8f Update Polls to use new MiniDbClientPlugin 2014-11-26 12:07:06 -06:00
libraryaddict
9928811a71 Merge pull request #2 from Better-Holograms to master 
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
  Remove the 'Made by Shaun'
  Fix up mistakes in the previous modifications
  You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
  Ignore wither skulls for CustomTagFix
  Remove old holograms and add new holograms
 2014-11-26 06:07:57 -06:00
libraryaddict
ef59cb7a9d Merging changes from master to Better-Holograms 
* master:
  Antistack replacement

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-11-27 01:01:19 +13:00
libraryaddict
03075fecae You have your HologramManager presented in a light most fair. 
Should be worth noting I didn't test it thoroughly
 2014-11-26 10:28:37 +13:00
Jonathan Williams
484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Jonathan Williams
3b54789767 Optimized logins dealing with mysql with multiqueries. 
Added lazy loading of Pool data and Loaded check before performing anything.

Refactored MiniClientPlugin and created MiniDbClientPlugin

Renamed RankBenefitManager9000 to BenefitManager

Removed /send ability for now.
 2014-11-25 13:25:13 -08:00
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
972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08:00
Chiss
ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11: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
Jonathan Williams
8466b8e2dd Fixed building issues with EnjinTranslator 
MAde mysql repo always record rank change even if windows return rank is different.
Added rough single player replay functionality.
 2014-10-17 00:41:23 -05:00
Jonathan Williams
c641eab3c7 Fixed up friends. 2014-10-03 01:50:23 -07:00
Jonathan Williams
c2b84cc60f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-30 12:20:14 -07:00
Shaun Bennett
7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
Jonathan Williams
8bca23f0ba Fixed bug with custom tag fix :P 
Fixed bug with server group up time check in servermonitor.
 2014-09-25 23:27:08 -07:00
Jonathan Williams
d32085f05b Removed tab list stuff for friends. 
Implemented rudimentary friends chat list.
removed unused code in server stuff.
Added null check for retrieving server statuses.
 2014-09-24 01:31:56 -07:00
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