JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,482 Commits 1 Branch 0 Tags 481 MiB
4f00c72d8c
Commit Graph

3135 Commits

Author SHA1 Message Date
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
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
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
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
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
Keir Nellyer
390b2878dc Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-07 14:28:30 +01: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
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
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
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
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
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
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
AlexTheCoder
3212b75e4e - Finally finished all of chiss' changes 2016-03-12 09:35:44 -05: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
Virizion
67e844db29 Added /e bridge <seconds> PC-17 2016-03-08 21:21:53 -05:00
Ben
5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Virizion
6c0d18662f Added /e clear <player or @a> PC-16 2016-03-08 20:45:23 -05:00
Ben
befb27d3db Finalized Vanish system 2016-03-09 01:45:17 +00:00
Virizion
c89669aec9 Add /e announce <text> PC-15 2016-03-08 20:23:33 -05:00
git
496983ee04 Untested bugfixes 2016-03-07 22:29:14 +13:00
Shaun Bennett
d108679d43 Fix compile error 2016-03-04 14:09:20 -06:00
git
6d0ca4f813 Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2016-03-03 13:49:31 +13:00
git
0ffa67dfb8 Ring game 2016-03-03 13:48:22 +13:00
Keir Nellyer
b18f2d8682 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-03-02 20:02:09 +00:00
Shaun Bennett
3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Shaun Bennett
a3b7a3269c Merge branch 'develop' into Dual_1.9 2016-03-01 15:14:59 -06:00
Shaun Bennett
923e51483c Remove fill line 2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432 Fix bucket 2016-02-26 04:21:26 -06:00
William Burns
268536ce68 push 4 shaun 2016-02-26 08:13:28 +00:00
William Burns
e4ba5d9723 Fix colour targeting FINALLY! 2016-02-25 19:48:15 +00:00
William Burns
dead7a0850 Use a different method for targeting blocks. 2016-02-25 16:09:00 +00:00
William Burns
a97409b64a Adjust max distance for targeting. 2016-02-25 15:04:19 +00:00
William Burns
7f6517a823 Ignore barrier blocks when drawing. 2016-02-25 14:23:16 +00:00
git
2a9d49ccd9 Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
William Burns
19b6c3d95f Make sure the blocks are in the canvas. 2016-02-24 21:37:22 +00:00
William Burns
a5060e014b Replace old paint bucket recursive filling. 2016-02-24 21:34:41 +00:00
William Burns
35a853a198 Remove redo/undo system as per request of @mightysigils. 2016-02-24 08:17:13 +00:00
William Burns
33bf3e2e6e Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update 2016-02-24 08:03:42 +00:00
William Burns
700f5ec44a Add Redo/Undo system (WIP). 2016-02-24 07:58:50 +00:00
Keir Nellyer
99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2016-02-22 19:02:54 +00:00
AlexTheCoder
3b7a7e457c Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-20 03:20:27 -05:00
AlexTheCoder
0a6cdfa779 - chiss' requested changes 2016-02-20 03:18:59 -05:00