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

10646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shaun Bennett
3d5e61e0f1 Eternal Giveaway Fixes 2016-11-17 21:05:10 -05:00
Shaun Bennett
562d7de1a9 Eternal giveaway refactoring 2016-11-17 21:05:10 -05:00
Shaun Bennett
cdfd030999 Revert: Disable Fated giveaway tools for now 2016-11-17 21:05:10 -05:00
Shaun Bennett
712019b45b Eternal Rank 2016-11-17 21:05:10 -05:00
Shaun Bennett
c080d41dc2 Temp DB fixes 2016-11-17 19:08:32 -05:00
xXVevzZXx
85d6452432 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall 2016-11-17 23:17:24 +01:00
Sam
0ca79f193f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 21:20:28 +00:00
Sam
53b67214fb More bugs 2016-11-17 21:20:00 +00:00
Shaun Bennett
f6a694b4fc Fix Metal Man distribution 2016-11-17 16:18:51 -05:00
Shaun Bennett
10911c9a9c Revert CTF Proxy Fix 2016-11-17 16:17:39 -05:00
Sam
142cf4dd93 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 19:41:47 +00:00
Sam
78a123156a Memory leaks! 2016-11-17 19:38:07 +00:00
xXVevzZXx
26d8fe5e6e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall 2016-11-17 19:19:28 +01:00
Shaun Bennett
e845f7fca9 Disable Fated giveaway tools for now 2016-11-17 02:13:48 -05:00
LCastr0
b862a30c76 Thanksgiving Cosmetics (#278) 
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...

* Fixed Pet menu
Fixed morph menu
Changed from List to Set

* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned

* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first

* Changed some stuff from Holiday Manager so now chickens will walk around when spawned

* Added sound effects to Metal Man
Added slowness to Metal Man

* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens

* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package

* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph

* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles

* Added hover ability to Metal Man Morph

* Fixed some stuff on Metal Man
 2016-11-17 02:06:00 -05:00
cnr
db1598f896 Revert 1.11 disguise changes 
Entity type tracking for disguises is now done in our spigot build.
 2016-11-16 23:36:47 -06:00
Shaun Bennett
cbc9aeedc6 Report Feature Improvements (#269) 
Report Feature Improvements
 2016-11-16 22:52:14 -05:00
Shaun Bennett
c250796bdf Fix pom.xml formatting 2016-11-16 22:37:25 -05:00
AlexTheCoder
7d14b6073d Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map 2016-11-16 22:37:25 -05:00
AlexTheCoder
5e1fcabe36 Final changes for S2 2016-11-16 22:37:25 -05:00
AlexTheCoder
a8e3a530c1 Prevent safely logging out in shop zones while tagged 2016-11-16 22:37:25 -05:00
AlexTheCoder
4a186a8dec Disable crafting of hoppers 2016-11-16 22:37:25 -05:00
AlexTheCoder
4fc2b875d4 Add a clans map generator to codebase 2016-11-16 22:37:25 -05:00
AlexTheCoder
a219a2d072 Fix TNT breaking bedrock, increase build height and add a minimum chest place height 2016-11-16 22:37:25 -05:00
AlexTheCoder
1535fcc38b Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks 2016-11-16 22:37:25 -05:00
AlexTheCoder
63ef68976c Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective 2016-11-16 22:37:25 -05:00
Sam
22b7ce60eb For sam 2016-11-17 02:56:58 +00:00
Alexander Meech
c21e71606d Fix message line spacing for Prince Artix 2016-11-16 21:42:47 -05:00
AlexTheCoder
b374d728f5 Change playwire button, modify player messages, and fix availability bugs 2016-11-16 21:42:47 -05:00
AlexTheCoder
0070fed6c7 Fix playwire multithreading and convert to new 5-ticket per 24-hour system 2016-11-16 21:42:47 -05:00
AlexTheCoder
824ef685c0 Add missing return 2016-11-16 21:42:47 -05:00
AlexTheCoder
d5f89bb370 Add more blocked commands and move the blocked command handler below the Mineplex command executor 2016-11-16 21:42:47 -05:00
AlexTheCoder
4cb257e84a Tweak blocked commands system 2016-11-16 21:42:47 -05:00
Sam Sun
4709161180 Attempt to fix CTF Proxies (#280) 2016-11-16 21:40:42 -05:00
md-5
735550c157 Use Mineplex Pair Util Class in Halloween 2016 (#274) 
JavaFX is not included in OpenJDK.
 2016-11-16 20:29:33 -05:00
Shaun Bennett
0039b79281 Change Youtube Button Link (#275) 
* Fix possible NPE in Preferences

* Change youtube button link
 2016-11-16 20:23:14 -05:00
Sam
8d6eb13504 Add "%player% is your teammate" in 2 player team games (#273) 
* Add "%player% is your teammate" in 2 player team games

* Add to Team Skyfall
 2016-11-16 20:10:16 -05:00
Sam
684432d7dc Add Rules Command (#272) 
* Added a /rules command

* Remove unused space

* More Spaces!
 2016-11-16 19:59:24 -05:00
Sam
51c7801a9f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-15 20:01:21 +00:00
cnr
70ca2c7964 Add 1.11 support 2016-11-15 13:58:31 -06:00
xXVevzZXx
a74bc71018 fix bugs and make some improvements 2016-11-15 17:04:38 +01:00
Sam
faba1f2369 Forgot the actual UHC class... 2016-11-13 12:35:48 +00:00
Sam
efc73d220f Change how UHC handles time 2016-11-13 12:35:38 +00:00
Sam
07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00:00
Sam
aa4ef9f4ad Big bugs 2016-11-12 21:50:38 +00:00
xXVevzZXx
3f6af6372d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall 2016-11-12 14:51:44 +01:00
Keir Nellyer
6e5db69b0c Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-10 13:52:44 +00:00
Sarah
e71187aa33 Add new Brawl Games (#260) 
* add more Brawl games

* fix some bugs in new brawl games

* fix even more bugs

* Fix some super paintstrike bugs

* Add some Javadoc
 2016-11-09 20:38:49 -05:00
Keir Nellyer
af7557c9b1 When multiple accounts with the same name occur, pick the one that 
logged in most recently
 2016-11-09 01:25:33 +00:00
Nate Mortensen
3b83a9bdc3 Reformat Block Hunt 2016-11-08 10:44:39 -05:00