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

6710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NewGarbo
205e3885b8 disallow players on pvp timer to use bows 2016-02-23 16:14:56 +00:00
NewGarbo
41e140d5ca stop players from placing water in outposts 2016-02-23 16:07:12 +00:00
NewGarbo
bcd4480f23 stop recruits from opening trapped chests 2016-02-23 15:57:12 +00:00
NewGarbo
306e56980c remove weapon teleport fix 2016-02-23 14:44:07 +00:00
NewGarbo
de4568d448 accurate-ish weapon damage tracking 2016-02-23 13:03:50 +00:00
NewGarbo
f0fc2fd519 progress [testing github] 2016-02-22 20:44:00 +00:00
NewGarbo
76cf65c267 siege system changes 2016-02-22 09:34:04 +00:00
NewGarbo
db7382d01e testing github? 2016-02-21 01:34:13 +00:00
Shaun Bennett
3a73b05895 Fix for ServerMonitor not loading database config 2016-02-20 00:48:30 -06:00
Shaun Bennett
41bb8442cd Merge pull request #2 from Mineplex-LLC/develop 
Merge Release v1.1.0 into Master
 2016-02-20 00:23:29 -06:00
Shaun Bennett
b46e1bc37d Create README file 2016-02-19 22:17:23 -06:00
Shaun Bennett
82d51a896f Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS 2016-02-19 19:54:06 -06:00
Shaun Bennett
8d7453b78e Merge remote-tracking branch 'origin/develop' into develop 2016-02-19 19:33:52 -06:00
Shaun Bennett
7032568a92 Add PLAYER_STATS DBPool 2016-02-19 19:33:39 -06:00
md_5
a84f8dd2d0 Fix dbcp, tone down sentry 2016-02-19 20:28:22 +11:00
md_5
81f9ca0bc2 Fix mysql 2016-02-19 20:10:01 +11:00
Shaun Bennett
6e2eea50bb Merge remote-tracking branch 'origin/develop' into develop 2016-02-19 02:46:25 -06:00
md_5
d575266522 Fix sentry 2016-02-19 19:44:36 +11:00
Shaun Bennett
3b10207503 Class.forName! 2016-02-19 02:40:14 -06:00
Shaun Bennett
d3d22bbec9 Merge pull request #168 in MIN/mineplex from clans/alpha to develop 
* commit '67c355bf652e9c802dc1e8e56b088c44cdaaac3b': (21 commits)
  remove more eclipse files
  remove eclipse files
  moar undead fixes
  Fixes to observer settings
  Clans Alpha 1.0 changes
  WP Evade
  More alphs bug fixes
  Fixes to flame and broadsword
  Clans alpha bug fixes
  Fixed /c stuck timer taking 7 seconds instead of 2 minutes
  Fixes to TntProtection
  Added safe zone protection for flame
  finalized alpha patches
  alpha fixes
  raised war points for invasion to 25
  Fixes to war point evasion
  Added fix to WarPoint evasion bug + 1 dmg bug
  that's not needed
  MAVEN TEST COMMIT
  Fixed issues with Broadsword Added max building height of 100
  ...
 2016-02-19 01:30:09 -06:00
NewGarbo
67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00
NewGarbo
441cf702c7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-19 07:22:09 +00:00
md_5
c811906a7e REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a) 2016-02-19 18:21:01 +11:00
NewGarbo
d5583b93f2 remove eclipse files 2016-02-19 07:14:13 +00:00
Shaun Bennett
7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
Shaun Bennett
eab992e621 Delete SimpleStats 2016-02-18 23:01:23 -06:00
md_5
6d81e43b30 Don't print db config to System.out 2016-02-19 15:30:30 +11:00
md_5
b58ea5b51a Provide option to load config from mineplex.yml, not per game folders. 2016-02-19 15:25:09 +11:00
NewGarbo
dc5fe21f3d more npe checking 2016-02-18 21:53:55 +00:00
NewGarbo
24b834370b null pointers with siege weaponl oading 2016-02-18 21:37:13 +00:00
NewGarbo
8507bb1bd8 all progress over this week 2016-02-18 21:29:42 +00:00
libraryaddict
8b1b63c8b3 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 
Conflicts:
	Patches/craftbukkit.jar
 2016-02-18 16:45:37 +13:00
md_5
1a1c64dc51 Fix PerkMadScientist on non game zombies. 2016-02-17 18:44:49 +11:00
md_5
b5f4055269 Fix command stack trace on unitialized arcade games. 2016-02-17 18:40:24 +11:00
md_5
3fad9c639a Fix stack trace in master builders when clicking on a watch. 2016-02-17 18:39:26 +11:00
md_5
50f58ba3a5 Don't stack entities when a game isn't running. 2016-02-17 18:33:40 +11:00
md_5
628e77a701 Don't process empty chat messages. 2016-02-17 18:32:43 +11:00
md_5
e6c00b06ee Fix exception in GameChatManager if an Arcade game has not been initialized. 2016-02-17 18:29:47 +11:00
md_5
e3861d3bc0 Fix NPE in TnTGenerator 2016-02-17 18:22:37 +11:00
Shaun Bennett
c20e32d2c0 Merge remote-tracking branch 'origin/develop' into develop 2016-02-16 16:55:11 -06:00
Shaun Bennett
684a40db41 Fix giving TITAN in Staff Server 2016-02-16 16:55:00 -06:00
Shaun Bennett
1c5ae77329 Fix Valentines quick server menu button 2016-02-16 16:54:05 -06:00
md_5
8893db60d7 Fix highly annoying exception in Reindeer mount. 2016-02-16 12:46:39 +11:00
Shaun Bennett
37757ad7de Add TypeWars to MPS 2016-02-15 18:55:13 -06:00
Shaun Bennett
904798ec22 Delete libraries directory/old craftbukkit jar (now in Patches folder) 2016-02-15 18:10:44 -06:00
md_5
6d7dbf6c67 Fix Sentry when running from shaded jar. 2016-02-16 10:51:16 +11:00
Shaun Bennett
95c22a59fd Use DNS for chat filter 2016-02-15 16:30:57 -06:00
Shaun Bennett
d1e098ca13 Merge remote-tracking branch 'origin/develop' into develop 2016-02-15 20:44:52 -06:00
Shaun Bennett
15ed2570e2 Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
NewGarbo
a5de88e6ee accidentally added those ifles 2016-02-15 11:25:33 +00:00