1a96ea3c18
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-05 20:29:28 +02:00
db21c7dd22
EGit FTW!
...
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....
This should have been part of prev commit.
2016-05-05 20:26:00 +02:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
0e509898ec
Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system
2016-05-03 21:07:50 -04:00
cfc6f3703d
Merge pull request #50 from Mineplex-LLC/develop
...
Merge from develop
2016-05-03 13:24:32 -03:00
838cc2ce31
fix enchantments and increase arrow amount in gladiators
2016-05-02 23:01:59 +02:00
8dd89d9dea
fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars
2016-05-02 20:27:43 +02:00
055b8684c2
- Added action bar message when booster is ready (Wind Up Suit)
...
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
2016-05-02 00:13:06 -03:00
71f8640189
implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds
2016-05-02 01:06:00 +02:00
6c2caac800
fix some format issues and implement God battles
2016-05-01 19:43:42 +02:00
7bd6cdb93c
Implement Lists and Maps into the variable system and finish more gamemodes
2016-05-01 18:48:07 +02:00
070326e72d
Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding
2016-04-30 19:26:16 -04:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
e0e30a8b7f
Merge pull request #43 from Mineplex-LLC/alex-mcl
...
Fix Async Elo Ranked Bans
2016-04-30 14:46:49 -04:00
41e26f283c
Fix all async elo ranked ban methods and switch to callback system for API hooks
2016-04-30 14:10:09 -04:00
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
184d247fc9
Start adding BoosterPage. Move Boosters to core to support UI's
2016-04-29 17:37:34 +10:00
2887630cf8
- Added javadoc headers
2016-04-28 21:11:38 -04:00
680e579223
Merge Alex's branch into mine.
...
Convert to Java 8
Remove unneeded comments.
2016-04-28 19:39:24 -05:00
156982460f
- Fixed water permanently [MCL]
...
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
2016-04-28 20:03:09 -04:00
b105ccb5f1
- Change event priority
2016-04-28 17:48:16 -04:00
b13528ed66
- Further blockage of creating source blocks [MCL]
2016-04-28 17:46:57 -04:00
3f9ef24235
- Removed debug message
2016-04-28 17:44:37 -04:00
189296a586
- Fixed using water in restricted zones in MCL
...
- Implemented Elo in /stats menu
2016-04-28 00:53:04 -04:00
46f873634e
- Decrease time till Overtime in MCL
...
- Block ability to flood in MCL
2016-04-28 00:33:36 -04:00
b4c5be81f3
- Fixed random weather in MCL
...
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
d90e9e7dff
Add a system for allowing all players to use game commands when in the correct mode.
2016-04-27 20:54:52 +01:00
1b5b18c9b2
Prevent exception while adding variables to gamemodes
2016-04-27 17:50:01 +02:00
aa219ec3e5
Implement gamemode feature with modifiable variables and working on first moded games
2016-04-27 17:42:50 +02:00
a16145479e
- Disabled picking up lava
...
- Leaving ranked matches temp bans players from rejoining them
2016-04-27 03:18:44 -04:00
38d03b8468
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-04-27 00:03:29 +02:00
79f210e242
Schematic and WinEffect update
...
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
2016-04-27 00:01:30 +02:00
f0cfac8e73
Merge pull request #31 from Mineplex-LLC/develop
...
Merge from develop
2016-04-24 23:15:36 -03:00
96aa5d1c4b
Removed duplicate code
...
Somehow this got duplicated and so therefore was causing compile time
errors, might have been something to do with my git merge.
2016-04-24 17:22:21 +01:00
a0fd852537
Move field to top of class in Game
2016-04-24 13:38:58 +10:00
b21dfad12e
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-04-24 13:37:45 +10:00
c7970d1bd0
Prevent super paintball spectators from reviving teammates. Fixes PC-103
2016-04-22 19:48:03 -05:00
b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
2a4c3209b4
- Enable ELO
2016-04-22 05:44:56 -04:00
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
34f94c0381
Reverted scoreboard because of MC maxlines turd nugget.
2016-04-22 02:55:27 -05:00
4577cf0398
Fixed scoreboard :D
2016-04-22 02:47:48 -05:00
7cc4811ede
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo
2016-04-22 02:39:35 -05:00
f922be51fe
Scoreboard tweak.
2016-04-22 02:39:08 -05:00
04fe30df43
- Fix sb
2016-04-22 03:38:20 -04:00
03bdc8d2db
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:17:54 -04:00
b69a75355c
Fixed scoreboard alignment.
2016-04-22 02:17:40 -05:00
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
44d4255628
Added endElo in the appropriate spots.
2016-04-22 00:58:07 -05:00
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
d0e3b094c1
- cleaned up and prepped for live update
2016-04-21 20:57:35 -04:00
e55bec505b
- Fix players ending up teleported back to arena due to broken respawn engine
2016-04-21 20:13:39 -04:00
df55d48ab8
- Looks better
2016-04-21 01:03:14 -04:00
d57cc48f0f
- Added new features!
2016-04-20 22:31:54 -04:00
f86b18b603
Elo Works Now
...
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
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
2d45ab61cc
Elo re-calculated
...
Elo is now being incremented more consistently (and not multiple times)
2016-04-20 15:48:27 -04:00
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
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
6dc2559dd1
Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems
2016-04-19 13:57:33 +10:00
e08965aa25
- Fixed TowerDefender being too difficult to obtain
...
- Fixed wither attacking own towers by accident
2016-04-18 22:58:55 -04:00
6c20427395
- Fixed some bugs and added final achievements
2016-04-18 22:32:15 -04:00
17ac3cb597
- Fix armor checking
...
- Edit wither death message
2016-04-18 20:29:53 -04:00
10aba533f3
- Remove all dependence on UtilShapes
2016-04-18 19:59:55 -04:00
34399db6e8
- Fixed missing GameType
2016-04-18 18:42:56 -04:00
e45f800519
Fixed damage calculator error
2016-04-18 20:36:22 +02:00
9de990744d
Stage
2016-04-18 17:46:38 +10:00
ee30012011
Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-17 12:27:23 -04:00
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
4c35e35fc0
- More polish and bugfixes
2016-04-16 23:59:44 -04:00
9c2cd6a883
Merge branch 'feature/redis-update' into feature/gems
2016-04-17 13:08:11 +10:00
35d7dd8b44
- Fixed stuff
2016-04-16 20:36:19 -04:00
b0d30a4ff4
- cleaned everything up
...
- renamed game
2016-04-16 20:32:14 -04:00
d8f5ac66fc
- More chiss
2016-04-16 14:05:46 -04:00
696088b57e
Fixed gun stats between games
2016-04-16 18:16:53 +02:00
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
ffc0459e5a
Cosmetic Update
...
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils
* Edited some particles, hats and death animations
2016-04-16 02:24:41 +02:00
2b2b251548
Merge branch 'clans/beta' into develop
2016-04-15 12:41:14 -05:00
09f9ae3b7a
- Update for playability
2016-04-14 23:05:14 -04:00
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
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
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
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
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
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
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
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
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
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
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
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
5e1003cccb
Missed a minus sign in my previous commit.
2016-03-31 14:06:45 -04:00
6ccc6df6aa
Elo calculations now account for player's Elo, relative to the average Elo among players
2016-03-31 13:57:21 -04:00
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
4ae4f056ea
- Map Polish
2016-03-31 03:46:43 -04:00
40175db217
- Lots of polish
2016-03-31 03:41:07 -04:00
6048c97b52
Tweaks to clean/clarify things
2016-03-29 17:50:06 -04:00
51cd770d38
Changes to help smooth the transition into using EloSettings.
2016-03-29 16:00:57 -04:00
d8d952691b
cleaning up my code a bit
2016-03-28 13:40:34 -04:00
abcdadc8d0
Corrected a small error in GameOption.
2016-03-28 12:40:41 -04:00
2530bc512e
- Fixed some more buggies
2016-03-26 14:02:18 -04:00
bb28b7ad89
- Forgot to comment out 2 lines
2016-03-25 20:27:17 -04:00
6678dffb61
- Updated everything for Sigils and chiss
2016-03-25 20:25:43 -04:00
57a1e06406
no message
2016-03-25 20:11:35 -04:00
f7575360db
Setting up a class to handle Materials as GameOptions
2016-03-25 16:42:39 -04:00
05ede7910e
All errors have been fixed.
2016-03-25 15:27:11 -04:00
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
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
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
eb6c385936
More flags changed
2016-03-24 17:52:02 -04:00
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
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
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
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
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
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
55e64a09b9
Test Gem Booster Item
2016-03-21 20:08:40 +11:00
0f83e302dd
Maintain game type boost queue across network.
2016-03-21 19:22:47 +11:00
750b960b46
Fixed references to snake events.
2016-03-20 16:24:11 -05:00
109190ee58
Moved snake events to their own classes.
...
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
262f659ffa
Fix with TurfForts infinite while loop.
2016-03-20 15:46:57 -05:00
3bc8dd0098
Fixed bug with infinite loop in Bridges MushroomSpawn.
2016-03-20 00:32:33 -05:00
723f62b8f9
incognito fixes and loads of other fixes
2016-03-20 01:06:46 +00:00
4899d56c09
Implement local gem boosters that can be activated on a joined arcade server.
2016-03-17 19:49:05 +11:00
3212b75e4e
- Finally finished all of chiss' changes
2016-03-12 09:35:44 -05:00
86c50cc3cd
updates
2016-03-11 19:03:32 +00:00
557b0bf978
Fix Wither disguise
2016-03-11 01:55:49 +13:00
67e844db29
Added /e bridge <seconds> PC-17
2016-03-08 21:21:53 -05:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
6c0d18662f
Added /e clear <player or @a> PC-16
2016-03-08 20:45:23 -05:00
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
c89669aec9
Add /e announce <text> PC-15
2016-03-08 20:23:33 -05:00
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
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
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
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
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
xGamingDudex
Keir Nellyer
AlexTheCoder
LCastr0
xXVevzZXx
Conrad
Shaun Bennett
TadahTech
William Burns
cnr
Jonathan Williams
Joseph Prezioso Jr.
md_5
Ben
Keir Nellyer
Shaun Bennett
Cheese
Shaun Bennett
git
Virizion