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

6490 Commits

Author SHA1 Message Date
Shaun Bennett c0d4fa1bea Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop 
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
  Store winner UUID instead of Player object to avoid leaking excess data
  Fixed who the winner is in MB Games.
 2016-01-20 12:33:56 -06:00
Shaun Bennett 4924d652f5 Store winner UUID instead of Player object to avoid leaking excess data 2016-01-20 13:33:40 -05:00
Shaun Bennett 7715df8e6a Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop 
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
  Fix ServerMonitor not actually removing ServerGroup instances.
 2016-01-20 12:24:33 -06:00
Shaun Bennett 359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop 
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
 2016-01-20 12:23:55 -06:00
Shaun Bennett c7bb380a56 Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop 
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
  Fix small memory leak in Mineplexer.
 2016-01-20 12:23:13 -06:00
Shaun Bennett 0a5791a92f Go back to compile scope, need to talk to md_5 about this 2016-01-20 13:13:20 -05:00
Shaun Bennett 037a2f8353 Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command 2016-01-20 13:04:31 -05:00
Shaun Bennett 8977735baf Include a version.properties in maven build 2016-01-20 11:57:21 -05:00
Shaun Bennett 8017da9413 Delete JedisTest 2016-01-20 10:25:31 -05:00
Shaun Bennett 63637e0ddb Add IntellIJ files to gitignore 2016-01-20 10:19:25 -05:00
Shaun Bennett ea315a1447 Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop 
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
 2016-01-20 10:19:09 -05:00
Shaun Bennett 77d9f7cf32 Merge branch 'master' into develop 2016-01-20 10:12:20 -05:00
fooify 376f719c26 fixes important bug, fixed a scary typo! 2016-01-19 18:52:54 -08:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Teddy 573d0dd67d Stats added for all other games 2016-01-19 23:10:45 +00:00
Shaun Bennett 951c27123a Remove /disguise for YOUTUBE_SMALL in arcade 2016-01-18 22:10:01 -05:00
Teddy c52bc8024c Halloween, added kit to stats 2016-01-18 11:41:30 +00:00
Teddy 740eeae9bd Halloween, added stats 2016-01-18 11:40:46 +00:00
Teddy 3fc25359be Gravity, added stats 2016-01-18 11:38:43 +00:00
Teddy b22f452b1f Gladiators, added stats 2016-01-18 11:36:16 +00:00
Teddy 297e9baf41 Evolution, added stats 2016-01-18 11:34:43 +00:00
Teddy f3d27c9d93 Draw my thing, added stats 2016-01-18 11:32:40 +00:00
Teddy 3d88f5aaae Dragons, added stats 2016-01-18 11:11:32 +00:00
Teddy ba50b5fdb1 Dragon Riders, added default registery 2016-01-18 11:09:19 +00:00
Teddy c3d9be2123 Dragon Escape Teams, added stats 2016-01-18 11:05:09 +00:00
Teddy 85f4ee50f0 Dragon Escape, added stats + implemented kit display for stats 2016-01-18 11:04:12 +00:00
Teddy 66f484760e Death Tag, added stats 2016-01-18 10:53:56 +00:00
Teddy 96d16932dd Christmas Chaos, added stats 2016-01-18 10:50:04 +00:00
Teddy dc44207d7a Champ TDM, added stats 2016-01-18 10:48:10 +00:00
Teddy 4e09aa4c34 Champ Dominate,added stats 2016-01-18 10:45:48 +00:00
Teddy f79acaaa2a Champ CTF,added stats 2016-01-18 10:43:46 +00:00
Teddy 508c4e99d2 Castle Siege,added stats 2016-01-18 10:41:10 +00:00
Teddy b0eb5a6d4e Cards Against Humanity, skipped/left blank 2016-01-18 10:34:43 +00:00
Teddy 56b3e482f2 Master Builders, added stats 2016-01-18 10:32:38 +00:00
Shaun Bennett 044d2bac83 Fix some Invisibility preference bugs 2016-01-17 22:55:04 -05:00
Shaun Bennett 2b6074a210 Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command' 2016-01-17 22:46:56 -05:00
Sarah 5ed9295944 updating Hub command as well 2016-01-17 18:10:16 +01:00
md_5 4927bb8c0b Fix some misc suspicious calls to Collection methods. 2016-01-17 20:20:48 +11:00
md_5 55c54eeff4 Fix ServerMonitor not actually removing ServerGroup instances. 2016-01-17 20:11:25 +11:00
Sarah 52bda30f85 Mysts OCD again...... 2016-01-17 03:03:00 +01:00
Sarah 4a5d6b5f2a Mysticates OCD.... 2016-01-17 02:48:15 +01:00
Keir Nellyer 40833c80bd Tiny spell fix. 2016-01-17 00:34:18 +00:00
Keir Nellyer 398c56983b Retrieve player ranks from database and display them. 2016-01-16 23:45:37 +00:00
md_5 6cf08193df Fix small memory leak in Mineplexer. 
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
 2016-01-16 20:36:49 +11:00
Sarah 410bc1c74b not being able to disguise as banned/muted players 2016-01-15 19:12:50 +01:00
Teddy c16a719be1 Bridges, added stats 2016-01-15 13:37:55 +00:00
Teddy 9cd7240b61 BouncyBalls, giving errors when Loading, skipping chat stats 2016-01-15 13:28:42 +00:00
Teddy ec75169b70 BossBattles, giving errors when Loading, removed chat stats. 2016-01-15 13:07:21 +00:00
Teddy 3315a510dc Barbarians stats added + Block break stat tracker added 2016-01-15 13:01:26 +00:00
Teddy 6a3e9ac19f BaconBrawl stats added 2016-01-15 12:10:53 +00:00