Commit Graph

6584 Commits

Author SHA1 Message Date
Ben 48cfe4d91c fixed & inv see? 2016-03-08 00:27:06 +00:00
NewGarbo ae42aaaab1 Sammy changes + cleanup 2016-03-07 03:25:22 +00:00
NewGarbo 7e2086df1c flash fix, rares update, and outpost fixes 2016-03-06 19:55:58 +00:00
NewGarbo ae2da31544 Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-05 23:14:32 +00:00
NewGarbo 8cfbe20a08 re-added delay to /spawn 2016-03-05 23:09:57 +00:00
NewGarbo d92f817efc fixed some teleportation bugs and a bit of cleanup 2016-03-05 22:50:06 +00:00
NewGarbo e88736c1aa changes to scepter, NPE fix 2016-03-05 20:46:24 +00:00
NewGarbo d79107eaaa new legendary weapons and nether finzlizations 2016-03-05 03:07:25 +00:00
NewGarbo 7b9ff288f3 nether progresssisiannsnsssss 2016-03-03 23:23:20 +00:00
NewGarbo 73d8870daf nether work (forgot to commit days ago oops) 2016-03-02 19:42:53 +00:00
NewGarbo d524645ddd placed the clan name hologram thingy correctly because it's inside the outpost!!! 2016-02-23 19:11:29 +00:00
NewGarbo d65bf965c4 fix only some blocks of outpost being reset and explosion particles not showing up 2016-02-23 18:51:34 +00:00
NewGarbo 2956b18821 some hologram work 2016-02-23 18:45:04 +00:00
NewGarbo 879a211a41 change siege weapon damage indicator display length 2016-02-23 17:00:14 +00:00
NewGarbo deb22fd4e7 add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors 2016-02-23 16:54:07 +00:00
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
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
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
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