Joseph Prezioso Jr.
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
Joseph Prezioso Jr
91e550bdcc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr
a07e71ba08
GameOption takes a generic value to eliminate the need for more than the one GameOption class.
...
Remove the--now unnecessary--classes that inherited from GameOption.
Consequently, the creation and implementation of GameOptions should be much more efficient.
Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.
The above note generally applies to numerical values, but may apply to other values, as well.
2016-04-06 18:10:31 -04:00
Joseph Prezioso Jr
f030f78f08
Add headers to new classes, so as to comply with coding standards.
...
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
2016-04-06 16:20:26 -04:00
Joseph Prezioso Jr
09db5a8131
I'm committing this so I can checkout to a different branch
2016-04-05 16:41:50 -04:00
Joseph Prezioso Jr
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
Cheese
8f959a73eb
debug
2016-04-02 12:46:25 +11:00
Cheese
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
Joseph Prezioso Jr
6e23a17acb
Removed unnecessary code.
2016-04-01 16:01:57 -04:00
Joseph Prezioso Jr
5e1003cccb
Missed a minus sign in my previous commit.
2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr
6ccc6df6aa
Elo calculations now account for player's Elo, relative to the average Elo among players
2016-03-31 13:57:21 -04:00
Joseph Prezioso Jr
cbb9798c35
Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd.
2016-03-31 12:49:22 -04:00
Joseph Prezioso Jr
b1c29a4fa6
Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division.
2016-03-30 16:06:30 -04:00
Joseph Prezioso Jr
00ee594f28
Missed one file last time
2016-03-29 17:50:45 -04:00
Joseph Prezioso Jr
6048c97b52
Tweaks to clean/clarify things
2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr
51cd770d38
Changes to help smooth the transition into using EloSettings.
2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr
35fc5223b1
reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed)
2016-03-29 14:03:21 -04:00
Joseph Prezioso Jr
0c479e1562
Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo
2016-03-29 14:00:59 -04:00
Joseph Prezioso Jr
f496392c5a
EloDivision class created.
...
EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)
2016-03-29 13:49:59 -04:00
Joseph Prezioso Jr
38a079846d
Some basic ideas for Elo I will be experimenting with
2016-03-28 18:14:52 -04:00
Joseph Prezioso Jr
d8d952691b
cleaning up my code a bit
2016-03-28 13:40:34 -04:00
Joseph Prezioso Jr
abcdadc8d0
Corrected a small error in GameOption.
2016-03-28 12:40:41 -04:00
William Burns
e7245bcc11
Merge pull request #15 from Mineplex-LLC/feature/slack-api
...
Add a Slack API for sending messages through plugins.
2016-03-27 10:15:30 +01:00
William Burns
c1adb7e1bc
Remove Slack attachment functionality (for now).
2016-03-26 13:12:59 -04:00
William Burns
29966195ee
Create an API for sending Slack message to multiple teams and channels.
2016-03-26 13:07:41 -04:00
Joseph Prezioso Jr
57a1e06406
no message
2016-03-25 20:11:35 -04:00
Joseph Prezioso Jr
f7575360db
Setting up a class to handle Materials as GameOptions
2016-03-25 16:42:39 -04:00
Joseph Prezioso Jr
05ede7910e
All errors have been fixed.
2016-03-25 15:27:11 -04:00
Joseph Prezioso Jr
262c6c2fa6
Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur
2016-03-25 13:53:20 -04:00
Joseph Prezioso Jr
c1ef185e82
Flags have been changed and I have started to get rid of the errors that have started cropping up.
2016-03-25 12:48:39 -04:00
Joseph Prezioso Jr
667ec03f06
Still a few more flags to go. I'll get to them tomorrow. Hopefully, I'll also figure out where/if I need to change things elsewhere in the code.
2016-03-24 18:43:02 -04:00
Joseph Prezioso Jr
eb6c385936
More flags changed
2016-03-24 17:52:02 -04:00
Joseph Prezioso Jr
0246ec275e
More flags have been changed to use the new Game Options. WHY IS NOTHING BREAKING!? Not that I'm complaining. Just really confused...
2016-03-24 17:47:07 -04:00
Joseph Prezioso Jr
b5d3a6b8c3
Small fix to last commit so that everything works while I continue working on getting GameOptions working
2016-03-24 16:34:16 -04:00
Joseph Prezioso Jr
4e02258124
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-24 16:32:33 -04:00
Jonathan Williams
105f62e563
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-23 16:02:30 -05:00
Jonathan Williams
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
git
4dd756286e
Fix small resource pack bug
2016-03-23 20:32:13 +13:00
Shaun Bennett
1e73adf2af
Increase ram and cpu for event server
2016-03-23 10:23:04 +11:00
Shaun Bennett
656780d027
Change runAsync in MiniPlugin to use our own thread pool
...
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
2016-03-23 10:22:40 +11:00
Shaun Bennett
da9a642a6d
Process item for treasure before opening
2016-03-23 10:21:36 +11:00
Shaun Bennett
309b5464f2
Clean up Account Repository, attempt to load account ID from cache
2016-03-23 10:21:02 +11:00
Shaun Bennett
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
Shaun Bennett
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
Jonathan Williams
c9fdd83e17
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-21 20:31:04 -05:00
Jonathan Williams
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
Ben
2e41f906d0
moved completely to database managed clan blacklist, instead of the old hard-coded way
2016-03-21 22:37:35 +00:00
Shaun Bennett
61b79fab9d
Merge pull request #13 from Mineplex-LLC/PC-15
...
Fix PC-13, PC-15, PC-16, PC-17
2016-03-21 20:31:58 +11:00
Jonathan Williams
b4dfeb224b
Reduced NCP exempt time by .5s.
2016-03-21 02:06:11 -05:00
Ben
264e5d34b2
missing some files
2016-03-21 05:52:02 +00:00
