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

1884 Commits

Author SHA1 Message Date
Jonathan Williams 36cbe55a49 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-29 12:13:08 -07:00
Shaun Bennett 7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
CoderTim 578b5702bc Added commons-dbcp2.jar dependency to Mineplex.Core in eclipse 2014-09-27 04:18:19 -04:00
Peter Miller 1bf5debc06 Updating DDoSProtectionSwitcher switchServer() method to launch remote script for IP change instead of local. 2014-09-27 00:45:52 -04:00
Jonathan Williams eaee6c2733 AWork on FRiends. 2014-09-26 12:38:51 -07:00
Jonathan Williams 34baa8eafb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 23:27:19 -07: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
Chiss 895878ee40 Removing old items, fix for a larger problemo 2014-09-26 09:33:12 +10:00
Shaun Bennett 7ee4f549f8 Merge remote-tracking branch 'origin/master' 2014-09-25 18:04:06 -05:00
CoderTim ba2f0e37ef Log changes in players' coins to database 2014-09-25 17:03:26 -04:00
Jonathan Williams 91ca7fa6c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 05:37:21 -07:00
Jonathan Williams e29dd4ff71 Fixes for ServerMonitor. 2014-09-25 05:37:10 -07:00
Chiss 79e808814a Minestrike cleans up incendiary at the end of rounds 2014-09-25 20:52:13 +10:00
Jonathan Williams 1f0bd462e3 Fix for CustomTagFix leak. 2014-09-24 22:14:26 -07:00
Shaun Bennett f5c8b2b1ac Fix renaming pets for 1.8 clients 2014-09-24 22:31:09 -05:00
Shaun Bennett 57487e78cf Fix Gem Booster display bug 2014-09-24 21:59:25 -05:00
Jonathan Williams a54a2aadc0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-24 01:32:03 -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
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 efa03945cb Delete the MapParser zip file from root directory after copied 2014-09-23 17:05:21 -05:00
CoderTim efb3c26115 Switched back to the latest craftbukkit.jar 2014-09-22 03:59:28 -04:00
CoderTim acc056d32d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-22 03:56:16 -04:00
Chiss 5774de552d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-22 17:53:39 +10:00
Chiss a58335d906 Added GameStatManager.java 2014-09-22 17:46:36 +10:00
CoderTim 00c8bfbd61 Changed BungeeSign dependency to bukkit.jar to match dependencies in eclipse 2014-09-22 03:46:05 -04:00
CoderTim 77e21c0d99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-22 02:53:55 -04:00
MrTwiggy 5c9ee3e79e Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers. 2014-09-21 20:42:47 -04:00
CoderTim 1949de4fd7 Database implementation of NpcManager partially complete 2014-09-21 15:45:15 -04:00
Chiss 7ca4b6830b added in GameStatManager 2014-09-21 09:28:12 +10:00
Chiss 9fce0b1926 Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking) 
Moved stat stuff to gamemanager.
 2014-09-21 09:26:34 +10:00
Chiss 767a0247a6 More change to end game title :) 2014-09-20 16:36:30 +10:00
Chiss 6e60c301cf fixed Title for end game 2014-09-20 16:33:24 +10:00
Chiss d9677ddda2 Disabled saving game player log for non-tournament 2014-09-20 16:28:45 +10:00
Chiss a830c72d22 Jukebox will be removed. 2014-09-20 15:29:59 +10:00
Chiss be3e10a412 Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind. 2014-09-20 09:31:06 +10:00
Chiss 0d090d7bdc fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale 
added lore to coins in GUI, to help new players and sell more ranks
slightly lowered hitbox for headshots in minestrike
 2014-09-20 09:10:55 +10:00
Chiss 9bbac7578e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-20 08:29:06 +10:00
Jonathan Williams 960b0aa69e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-19 09:23:52 -10:00
Shaun Bennett ed85779876 Fix Treasure painball gun issue, fix parkour paintbull gun issue 2014-09-19 14:18:23 -05:00
Jonathan Williams 96498af626 Fixed parkour bug with gadget blocks. 
Removed a ton of debug messages with inventory close.
 2014-09-19 09:06:42 -10:00
Jonathan Williams d0edde9dbd Added rank benefit giver 9000 
Added MineStrike to beta timer.

Updated official craftbukkit.jar
 2014-09-19 02:57:35 -10:00
Jonathan Williams c8e755fe5f Reverted and merged twigs status update. (Needs fix on startDate.) 2014-09-18 22:22:01 -10:00
Jonathan Williams 239b021b0d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-18 22:03:49 -10:00
Jonathan Williams 18f2ef7564 Re-enabled SNAKE PARKOUR for hub. 2014-09-18 22:03:23 -10:00
Chiss 21c131273e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-19 18:01:52 +10:00
Chiss 91037384f9 Loot tweaks 
Music fixes
some bug fixes
 2014-09-19 18:01:38 +10:00
Jonathan Williams 7906f48262 Updated CoreClientManager to pull all account data via name request. 
Cleaned up some code with pet administrator.

added logging if 0 rows were being saved in CommitChanges
 2014-09-18 21:12:37 -10:00
CoderTim edce1c9f90 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-19 02:46:12 -04:00
CoderTim 8cb836d5b3 Fixed some achievement bugs 2014-09-19 02:46:04 -04:00
Chiss ed7eeab1a7 fixed exception 2014-09-19 16:13:11 +10:00