Commit Graph

3290 Commits

Author SHA1 Message Date
Jonathan Williams
6d00e8b41f Refactored Elo to work correctly. 2016-04-22 00:21:11 -05:00
AlexTheCoder
d0e3b094c1 - cleaned up and prepped for live update 2016-04-21 20:57:35 -04:00
AlexTheCoder
e55bec505b - Fix players ending up teleported back to arena due to broken respawn engine 2016-04-21 20:13:39 -04:00
AlexTheCoder
df55d48ab8 - Looks better 2016-04-21 01:03:14 -04:00
AlexTheCoder
d57cc48f0f - Added new features! 2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr.
f86b18b603 Elo Works Now
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
cnr
2d02d79cec Fix survival games' Beastmaster wolf spawning
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
2016-04-20 18:45:54 -05:00
Joseph Prezioso Jr.
2d45ab61cc Elo re-calculated
Elo is now being incremented more consistently (and not multiple times)
2016-04-20 15:48:27 -04:00
Joseph Prezioso Jr.
6a5c8336cf Elo and Division fixed
Elo and Division should be displaying properly

Cleaned the code up a bit

Added endElo() to Game.java to handle team Elo code

Added event listener to check for GameState.End in TDM to call endElo()
2016-04-20 14:52:06 -04:00
Thanos paravantis
6e011b3a89 Add missing SpawnDefinition interface 2016-04-19 21:52:45 +03:00
Thanos paravantis
cb4561c561 Implement team check on challenge selection system 2016-04-19 18:25:36 +03:00
Thanos paravantis
11aef273ba Fix NPE on Volley Pig 2016-04-19 18:25:04 +03:00
Thanos paravantis
50175f9453 Spawn players with equal distance from ladder on KOTL 2016-04-19 14:27:48 +03:00
Thanos paravantis
17c51f03ad Remove grass only from used spawns 2016-04-19 14:17:32 +03:00
Thanos paravantis
20fdb1f21c Restructure methods on Mini OITQ challenge 2016-04-19 13:59:09 +03:00
Thanos paravantis
816abad8de Fix Mini OITQ barriers enclosing players at spawn 2016-04-19 13:57:39 +03:00
cnr
bda9772ba6 Mitigate spigot issue when setting wolf owner
This fixes the Summon Wolves spell in Wizards.

Explanation:

- Wolves keep track of their most recent owner.
- When a wolf is assigned a new owner, it updates the data
  watcher with the new owner's UUID
- During this process, the old owner's UUID is checked
  against the new one
- If the wolf didn't have a previous owner, the old owner's
  UUID is the empty string.
- UUID.fromString() is called on the empty string, and throws
  an exception.
2016-04-19 02:46:38 -05:00
Thanos paravantis
09fb1842b6 Apply improvements and bug fixes 2016-04-19 10:00:06 +03:00
AlexTheCoder
e08965aa25 - Fixed TowerDefender being too difficult to obtain
- Fixed wither attacking own towers by accident
2016-04-18 22:58:55 -04:00
AlexTheCoder
6c20427395 - Fixed some bugs and added final achievements 2016-04-18 22:32:15 -04:00
AlexTheCoder
17ac3cb597 - Fix armor checking
- Edit wither death message
2016-04-18 20:29:53 -04:00
AlexTheCoder
10aba533f3 - Remove all dependence on UtilShapes 2016-04-18 19:59:55 -04:00
AlexTheCoder
34399db6e8 - Fixed missing GameType 2016-04-18 18:42:56 -04:00
AlexTheCoder
ee30012011 Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-17 12:27:23 -04:00
AlexTheCoder
d623d0982b Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0 - More polish and bugfixes 2016-04-16 23:59:44 -04:00
AlexTheCoder
35d7dd8b44 - Fixed stuff 2016-04-16 20:36:19 -04:00
AlexTheCoder
b0d30a4ff4 - cleaned everything up
- renamed game
2016-04-16 20:32:14 -04:00
AlexTheCoder
d8f5ac66fc - More chiss 2016-04-16 14:05:46 -04:00
Thanos paravantis
cb4e25fb0a Implement new challenge selection system
The new challenge selection system, picks a random challenge from
the list as a starting point. Once the challenge is ended, the next
one in the list will be selected. That process continues, until the
index is out of bounds, and from that point, a new starting point
will be selected. During that process, any challenge that is picked,
is also reviewed to make sure it's suitable according to the player
count. If that's not the case, the selection process will continue
until one challenge is found. If there is no appropriate challenge,
the game will be ended.

In addition to those changes, there are a couple of bug fixes and changes.
At first, some methods that keep track of player lists were renamed and
secondly, the enchantment lore is now hidden on challenges that use items.
2016-04-16 15:13:52 +03:00
Joseph Prezioso Jr.
bbb81dd663 Elo calls migrated to Game.java
Consequently, elo code is actually being called now

Bukkit.broadcastMessage calls have shown where things are breaking

handleElo() added to EloManager to facilitate movement of team elo code

preparing to use EloManager's getNewRatings() method to 
calculate team elos
2016-04-15 20:48:56 -04:00
Jonathan Williams
2b2b251548 Merge branch 'clans/beta' into develop 2016-04-15 12:41:14 -05:00
AlexTheCoder
09f9ae3b7a - Update for playability 2016-04-14 23:05:14 -04:00
AlexTheCoder
33b557eb10 - Huuuuuuuge amount of changes for chiss 2016-04-14 22:45:21 -04:00
Joseph Prezioso Jr.
742807d80e Added generatePlayerElos and updated saveDivision
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
2016-04-14 17:17:26 -04:00
cnr
6b2f601c7a Prevent a spectator race condition in arcade games
Previously, a player would erratically become a spectator if s/he
spammed the "spectate next player" action between rounds (i.e.
left-click while spectating a player).
2016-04-13 18:20:39 -05:00
Joseph Prezioso Jr.
9e8a7b582b Elo updates
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF

Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
2016-04-13 18:35:56 -04:00
Thanos paravantis
ea6219984a Add missing Spleef challenge to removed package 2016-04-09 11:06:46 +03:00
Thanos paravantis
0b780c8e99 Fix teleport delay and incorrect win placement.
Players that die during a challenge have the ability to fly
around as spectators. Although, once the challenge was ended
their fly mode was removed and they would fall for a very short
amount of time, which was noticeable. With that fix, players
now get reset once they are teleported to the spawn locations
of the next challenge. That happened because during the player
reset and spawn teleportation, the map would be generated, as a
result, causing a very small notable delay.

Moreover, win placement was fixed. In the previous version, the
third player would appear as second and the second player would
appear as the third one. The cause of this issue was that, after
the second and the third player is added to the winner list, the
last player that is remaining alive is added as first. To fix that,
I've implemented a swap method that changes the location of the
second with the third player.
2016-04-09 11:04:23 +03:00
Ben
a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
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
c6c52885a9 Fixed commit 2016-04-05 15:16:40 -04:00
Ben
7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Shaun Bennett
ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 00:57:28 +10:00
Shaun Bennett
fecd3c1eaa Final changes 2016-04-04 23:28:38 +10:00
Thanos paravantis
cc68b7087a Change wool color on Wave Crush challenge
During map generation, the wool color is now predetermined and not
random.
2016-04-03 17:15:20 +03:00
Thanos paravantis
18ff9c23f7 Modify block removal from Wave Crush challenge
The removeExtraBlocks() method was changed, in order to include all
arena blocks. The previous version did not remove all extra blocks,
as it was using the getArenaSize() method inside the for-loop, which
returns a different integer depending on the challengers.

To fix that, I've implemented the '_arenaStartSize' field to store the
starting arena size value that is used in the map generation method.
2016-04-03 16:53:14 +03:00
Thanos paravantis
114fac2655 Refactor Red Light Green Light challenge
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.

Moreover, a PlayerQuitEvent listener was added to remove players from
the '_cooldown' array list and a null check in the onEnd method, to
prevent any null pointer exceptions.

Also, there were some minor display changes, regarding titles and chat
messages on the moveTextAndSound() and cannotMoveTextAndSound() methods.

Lastly, the bedrock layer was removed from map generation.
2016-04-03 16:49:31 +03:00
Thanos paravantis
f454a6de81 Comment game classes and remove unnecessary checks
Added comments on game classes, except challenges
and statistics trackers.

Removed challenge validity checks from onCollide method in Anvil Dance
and Falling Blocks, since that is now handled on the Collide method
located in the main game class.
2016-04-02 22:49:56 +03:00
Thanos paravantis
12b90501e2 Refactor Wave Crush challenge
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.

Also, a new PlayerQuitEvent listener is added, in order to remove
players from the '_survivedWaves' hash map, which keeps track of
the waves every player survived.

Lastly, onCollide if-statement logic was reversed to reduce and
simplify the lines of code inside the method.
2016-04-02 22:10:43 +03:00
Cheese
9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11: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
AlexTheCoder
4ae4f056ea - Map Polish 2016-03-31 03:46:43 -04:00
AlexTheCoder
40175db217 - Lots of polish 2016-03-31 03:41:07 -04:00
Thanos paravantis
51820faceb General bug fixes and minor changes. 2016-03-30 19:30:22 +03: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
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
Thanos paravantis
cd08e5581a Fix volley pig challenge, apply minor changes and bug fixes on Infestation, Reverse Tag. 2016-03-27 17:45:58 +03:00
AlexTheCoder
2530bc512e - Fixed some more buggies 2016-03-26 14:02:18 -04:00
AlexTheCoder
bb28b7ad89 - Forgot to comment out 2 lines 2016-03-25 20:27:17 -04:00
AlexTheCoder
6678dffb61 - Updated everything for Sigils and chiss 2016-03-25 20:25:43 -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
Shaun Bennett
e8dcc4a3e2 Merge branch 'develop' into clans/beta
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +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
Thanos paravantis
72994656dd Improve dragon egg handling. Implement chat silence during challenge description. 2016-03-21 22:06:49 +02: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
Thanos paravantis
644e7a08bb Bug fixes (detailed description below) and hit box improvements.
- Cancel teleport event to prevent the game from breaking.
- Block Lobbers: Fix falling block spawning and item drops.
- Color Change: Fix platform not spawning after first stage.
2016-03-20 23:26:55 +02:00
Jonathan Williams
750b960b46 Fixed references to snake events. 2016-03-20 16:24:11 -05:00
Jonathan Williams
109190ee58 Moved snake events to their own classes.
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
Jonathan Williams
262f659ffa Fix with TurfForts infinite while loop. 2016-03-20 15:46:57 -05:00
Thanos paravantis
f57bd37116 Rush push, cloud fall and treasure digger updates/refactoring. Added /mark command to reveal and correct misplaced spawn locations. 2016-03-20 17:20:40 +02:00
Thanos paravantis
8084897782 Rush Push: Update custom damage event listener. 2016-03-20 12:14:09 +02:00
Thanos paravantis
c080bc31ab Refactor rush push challenge, update win placement. 2016-03-20 11:10:16 +02:00
Jonathan Williams
3bc8dd0098 Fixed bug with infinite loop in Bridges MushroomSpawn. 2016-03-20 00:32:33 -05:00
Ben
723f62b8f9 incognito fixes and loads of other fixes 2016-03-20 01:06:46 +00:00
Thanos paravantis
1a51f51f60 Refactor color change, reverse tag and treasure digger challenge. 2016-03-19 17:36:27 +02:00
Thanos paravantis
115508cf72 Refactor onChallengeUpdate method. 2016-03-19 16:14:56 +02:00
Thanos paravantis
4c8292e7c9 Update color change and reverse tag challenge, changes and improvements and spawnpoints update. 2016-03-19 16:01:42 +02:00
Thanos paravantis
dd6d128b44 Rename files to match challenge name, change kit description, refactor color change challenge. 2016-03-18 18:36:32 +02:00
AlexTheCoder
3212b75e4e - Finally finished all of chiss' changes 2016-03-12 09:35:44 -05:00
Thanos paravantis
2f96325f0c Challenge refactoring. 2016-03-12 11:16:37 +02:00
Ben
86c50cc3cd updates 2016-03-11 19:03:32 +00:00
git
557b0bf978 Fix Wither disguise 2016-03-11 01:55:49 +13:00