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
5d1194192d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site
2016-04-28 18:19:45 +01:00
bff5751691
Remove very last @author tag
2016-04-28 14:41:44 +01:00
dcd376b837
- Improved graphics for Elo display in /stats
2016-04-28 01:01:14 -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
b8d12c0c9d
Small wording changes.
2016-04-27 20:04:36 +01:00
a16145479e
- Disabled picking up lava
...
- Leaving ranked matches temp bans players from rejoining them
2016-04-27 03:18:44 -04:00
d0e7590b2a
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-04-26 23:23:45 -03:00
a7ef8bec49
Adds new constructor to NotePlayer, to be able to send the song to specific players
...
Some WindUp costume fixes
Added actionbar and song to WindUp suit
Created new booster manager
2016-04-26 23:21:59 -03: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
28de514d1a
Adds some utils for UtilColor
...
Small changes in Wind Up suit
2016-04-24 21:39:35 -03:00
949f9ca712
Don't allow players to report themselves
...
I left this to last minute to make testing easier, as with this check
in place it means at least two players are required to test the report
mechanism.
2016-04-24 18:10:01 +01: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
dab1f9485c
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-04-24 17:17:17 +01:00
9df4dac023
Remove dead code
...
This was left over from before I took over development of the report
feature.
2016-04-24 17:16:36 +01:00
713263214f
Run ReportPurgeTask asynchronously
...
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
2016-04-24 17:15:12 +01:00
57e9cd6e19
Add class headers and remove @author tags
...
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
2016-04-24 17:10:29 +01:00
491c509317
Added UnlockCosmetics command (/unlockCosmetics <type>)
...
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
2016-04-23 22:16:02 -03:00
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10:00
c7970d1bd0
Prevent super paintball spectators from reviving teammates. Fixes PC-103
2016-04-22 19:48:03 -05:00
ccd630e2ae
Leftovers from merge
2016-04-23 00:56:19 +02: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
fe0cee65e8
Added gem and coin rewards back into bonus.
2016-04-22 05:33:25 -05:00
260c617007
Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop
2016-04-22 05:12:30 -05:00
e28621ae26
Set oldElo equal to new elo on new row.
2016-04-22 05:04:13 -05: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
6db7e648f5
Don't insert new row if the update doesn't succeed because of elo mismatch on loss.
2016-04-22 04:20:59 -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
a31eccc15b
Multiply new rating by team size. MIssed that undo!
2016-04-22 02:53:02 -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
5e255fc4ed
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:36:21 -04:00
757c945320
Added in kFactor ratio application to rating delta.
2016-04-22 02:35:37 -05: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
aa6d25139f
Tweaked elo for team games.
2016-04-22 02:04:57 -05:00
b1c05e2ed0
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:12:02 -04:00
776093288a
Fixed rating not setting in EloPlayer constructor.
2016-04-22 01:11:48 -05:00
2d2c8858e6
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:06:55 -04:00
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
977fbe684a
Fixed elo query.
2016-04-22 01:06:33 -05: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
86df07123c
Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe
...
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:54:20 +10:00
e46798f20e
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:49:34 +10: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
588e6f08c2
- Removed TypeWars achievements to make room
2016-04-19 18:07:20 -04:00
793f5b3f41
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:20:31 -03:00
2b80ebabf7
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:14:22 -03:00
ef8474ae9d
Set default CustomExplosion maxFallingBlocks to 0
...
This fixes an exception thrown when the trap rune in Wizards is
activated.
2016-04-19 02:59:31 -05: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
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
d9b6434bad
Typo in description
2016-04-18 23:24:59 +02:00
534a5dee4e
Forgot to remove debug message
2016-04-18 22:18:42 +02:00
591d3cadc9
Cleaned up some GUI stuff, mostly lores on items
2016-04-18 22:16:10 +02:00
e45f800519
Fixed damage calculator error
2016-04-18 20:36:22 +02:00
44263beb87
- Make elo store/recover properly
2016-04-17 17:34:18 -04:00
4227e24ae0
Reintroduce non-Air constraint to cannon explosion
2016-04-17 16:29:23 -05:00
e375db5aec
Refactor cannon explosion effect for clarity
2016-04-17 13:33:44 -05: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
4477a215f4
Update to Redis 2.8.1 and clean up repositories ( #26 )
2016-04-16 22:51:20 -05: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
9c6d23f11e
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-16 07:31:00 -05: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
019cfe41cc
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-15 12:40:54 -05:00
609eb562e9
Merge branch 'clans/beta' into develop
2016-04-15 12:40:26 -05:00
a730b81feb
Commented out TournamentManager, moving off develop.
2016-04-15 12:38:25 -05:00
b43953439e
Properly store teamId locally after registering for tournament.
...
Use team id when unregistering for the tournament.
2016-04-15 12:36:28 -05:00
cf3141ddc0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-15 12:30:32 -05:00
77b6515387
Don't break the repair anvil more than twice
2016-04-15 12:21:25 -05:00
91d5851628
Don't set a clan's lastOnline time to Timestamp(0)
...
Partially reverts f011fdad5f
2016-04-15 12:21:25 -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
4a4e64a3ff
EloRepository overhaul started
...
Tinkering with EloRepository, using AccountRepository as a base
2016-04-14 20:09:09 -04:00
64d5f91e8f
Remove TeamInvite table.
2016-04-14 18:49:20 -05:00
0a32eed15d
Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular.
2016-04-15 00:43:55 +01: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
eb67c12108
Added getRepoElo to EloRepository
...
Added Bukkit.broadcastMessage() calls to test code
Methods that needed to throw SQLExceptions now throw SQLExceptions
2016-04-14 15:21:28 -04:00
3a26225ce2
Finished main tournament calendar UI.
...
Added registration for tournaments.
2016-04-14 12:21:24 -05:00
29b3f03abf
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-14 21:38:48 +10:00
cbc6689782
Disable /kill in tutorial and reset food level after hold position
2016-04-14 21:38:37 +10:00
eab76fefa2
Fix Cannons sometimes glitching out when the owner's clan is deleted.
2016-04-14 12:09:42 +01:00
3bf3eba005
Completely cancel the explosion falling block for claimed territories.
2016-04-14 12:08:54 +01:00
a295cade1c
Fix Cannon TNT sometimes breaking blocks in protected regions
2016-04-14 11:35:12 +01:00
ab21efd2ca
Give the correct amount of old/ancient chests for bonuses
2016-04-13 18:51:52 -05: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
6d01e235fd
Fix online friends list
...
Previously, it was incorrectly asserting that all players were
incognito. If we want to exclude incognito players, we'll have to find a
different way.
2016-04-13 17:24:46 -05:00
85f4ff1299
Starting on Tournaments.
2016-04-13 17:14:48 -05:00
91c97e38b8
Prevent players from naming their pets "ULTRA"
...
This was being used to fool support into thinking the player had won
Ultra from a chest
2016-04-13 16:37:13 -05:00
b54da22dd8
Create a basic site design for potential job applicants.
2016-04-13 21:06:47 +01:00
7cc0583d8e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-13 19:52:49 +01:00
355ab06e6c
Fix the Conquering attribute working for player attacks as well
2016-04-13 13:08:04 +01:00
a26403f006
Fix Recall & Smokebomb not working regularly
2016-04-13 13:04:43 +01:00
6428dfd723
Run clan-load callbacks on the main thread
...
This prevents potential CMEs from occurring when a player transfers
his/her clan to another server
2016-04-12 22:54:20 -05:00
e9d05474f8
Prevent cannons from changing bedrock into charred blocks
2016-04-12 17:14:48 +01:00
c0ebae4175
Ender chest blocker not actually canceling the opening event.
2016-04-12 17:13:03 +01:00
11d92c49ec
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-12 09:48:59 +10:00
eefed175ec
Add the random world event command.
2016-04-11 18:07:11 +01:00
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
313b59d1d6
Fix the terrain finder miscalculating the size of undead camps
2016-04-10 16:51:42 +01:00
e014f4fff9
Fix null pointer in the tutorial when using /tutorial finish
2016-04-10 16:51:12 +01:00
159a5403ac
Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug)
2016-04-10 16:47:46 +01:00
db8ca31567
Fix Meridian Scepter not being perfectly accurate.
2016-04-10 16:16:53 +01:00
0ac9747df1
Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed.
2016-04-10 15:27:20 +01:00
9a2f4a8936
Fix Meridian Scepter not damaging the victim (would just give the wither effect)
2016-04-10 15:23:43 +01:00
fe89a5b68e
Fix the Recall rare item duplication bug
2016-04-10 14:50:00 +01:00
67a36dc7e4
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-10 12:56:30 +01:00
66274188c8
Add a /we random command to spawn a random world event
2016-04-10 12:56:00 +01:00
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
3ee1f86841
Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff.
2016-04-10 12:36:31 +01:00
8ee2c02dd9
Disable the use of Ender Chests
2016-04-10 11:20:51 +01:00
e8e73306be
Change the Giant's Broadswords regeneration effect level from 41 to 3
2016-04-10 11:15:43 +01:00
dd3e009413
Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests
2016-04-10 10:53:07 +01:00
ccf9d4a4c2
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-04-09 13:01:04 -04:00
4bf19eebad
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-09 00:37:40 +01:00
92195a12d2
Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues.
...
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
2016-04-09 00:37:20 +01:00
6e9ae04118
Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32
2016-04-09 00:27:24 +01:00
8b6b3db412
Remove old pre-mavenisation files
2016-04-09 00:17:58 +01:00
6efb8d806d
Re-enable category threshold check
...
This was disabled for testing reasons.
2016-04-09 00:02:59 +01:00
05b31725a8
Fix initialization NPE.
2016-04-08 18:48:16 -04:00
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
8a2efa2f0b
Make sure a user has enough gold to make a purchase.
2016-04-08 10:48:55 -04:00
79a2ef3608
Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.)
2016-04-07 22:24:47 +01:00
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
2c05743f62
Stop using static with Siege Manager
2016-04-07 21:01:25 +01:00
36e79a1504
Add header to every class as per new coding standards.
2016-04-07 14:44:27 +01: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
c484a80a14
Remove incorrect import
2016-04-07 08:12:05 +01:00
b70ff03185
Fix siege weapon crater being spawned at the lowest block at the current collision location.
...
This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.
2016-04-07 08:11:37 +01:00
f2ac2d87bf
Remove debug command, that could be very abused
2016-04-07 08:07:18 +01:00
9ccec50fd0
Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up.
2016-04-07 08:06:16 +01:00
eed3df720a
Disable incognito mode for staff members that have been demoted whilst using it.
...
Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.
2016-04-07 07:00:46 +01:00
3a8ab581dd
Add JavaDoc to new classes to comply with the new standards
2016-04-07 06:52:52 +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
d75d63a81a
some missing files and blacklist barrier block from block toss
2016-04-06 18:26:56 +01:00
8b42de03cb
Debug messages for PoisonShock
2016-04-06 10:39:00 -05:00
d25f1abfbf
stop iron door from being opened by players not in clan (outpost)
2016-04-05 23:49:16 +01:00
738825ea9d
perms for tutoirial command
2016-04-05 23:37:08 +01:00
4bdd33c87b
blowing holes in the ground and interacting with cannon sometimes not working
2016-04-05 23:15:38 +01:00
744d8891b4
import
2016-04-05 22:58:03 +01:00
09db5a8131
I'm committing this so I can checkout to a different branch
2016-04-05 16:41:50 -04:00
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
be63012d18
make trainees+ not count to kicked player count
2016-04-05 12:43:19 +01:00
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
cfac41f216
full server trainee+ fix
2016-04-05 12:37:04 +01:00
dd5b2d5e3f
Fixed NPE with poison condition effect.
2016-04-05 00:36:18 -05:00
e23362bd6f
Fixed NPE in OrderedObjective
2016-04-05 00:36:00 -05:00
b34a175a2b
Fixed error in Outpost throwing NPE.
2016-04-05 00:35:44 -05:00
ae87db1742
Fix TNT generator timings
2016-04-05 13:04:52 +10:00
23232efd63
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 13:04:39 +10:00
b0dd51843b
Ride horse delay
2016-04-05 10:58:31 +10:00
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
cd5ad89f51
Made clans sort by server number.
2016-04-04 17:46:51 -05:00
53b25e6ee0
Fixed diamonds not selling in shops.
2016-04-04 17:46:35 -05:00
6558b16004
Fixed endless loop crash bug with Gear attributes.
2016-04-04 17:46:22 -05:00
8ea0051181
Fixed customer support menu not showing if monthly bonus hasn't been claimed.
2016-04-04 17:46:03 -05:00
2d296d9226
Removed debug ResourcePack Message
2016-04-04 17:45:34 -05:00
efa18d394b
Fixed Incognito not saving status.
2016-04-04 17:45:10 -05:00
2fa0787792
Clans now load, added connection property to null zero date timestamps.
2016-04-04 16:31:37 -05:00
2b3e466469
Removed pesky '?' causing login query to stall.
2016-04-04 16:30:57 -05:00
7de23216f6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 20:41:10 +01:00
b3b72f1ca0
commenting out clans bans
2016-04-04 20:40:58 +01:00
02459c6a10
Fixed bad implementation of IncognitoManager that was locking up threads.
...
Temporarily disabled MessageManager's handling of Incognito.
2016-04-04 13:48:26 -05:00
60010f90b4
Load simple clan token on player login to reduce overhead.
...
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
a91ef68978
Fixed CCM in WarPointEvasion.
...
Removed debug message; NOT RIDER
2016-04-04 13:46:39 -05:00
e2baf2b56c
Updated Clans to use the new ResourcePackManager.setResourcePack method.
2016-04-04 13:46:00 -05:00
1b1e6f6ef5
Moved the redis operation before asking for a mysql connection
2016-04-04 13:45:20 -05:00
781c4bfdbd
Removed db call off main thread for ClanServerPage
2016-04-04 10:31:13 -05:00
91ddac9643
Added world checking for boundary stuff.
2016-04-04 10:30:59 -05:00
e8da5ca0f2
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 10:02:01 -05:00
228a001696
Added Shift Left clicking to the ban list for Cannon :D
2016-04-04 10:01:50 -05: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
14207c2073
clansbans
2016-04-04 14:56:20 +01:00
8330ef560d
not rider spam
2016-04-04 14:55:47 +01:00
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
02cb0e1f7e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-04 13:52:44 +01:00
1dde17b9cc
shooters still shotting fix
2016-04-04 13:51:05 +01:00
e85a1e6a3b
fixes to breakingand placing in claim
2016-04-04 22:22:07 +10:00
4262a4d4b7
Increase radius + delete iron doors after done
2016-04-04 22:07:58 +10:00
963bba06f7
fix for displaying territorial movements
2016-04-04 17:47:58 +10:00
2e0c9d3965
Remove potatoe message
2016-04-04 17:34:39 +10:00
aaccb6fd48
Join/leave/death messages
2016-04-04 17:20:21 +10:00
15c4b2dd58
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 17:11:15 +10:00
23e116f9b5
Region fixes
2016-04-04 17:10:52 +10:00
56a087612b
Changes to explain energy goal
2016-04-04 16:58:16 +10:00
be8ed78caa
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 16:46:17 +10:00
02f774ce94
A lot of bug fixes
2016-04-04 16:45:20 +10:00
85fabd525a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 00:59:25 -05:00
400d2f0cca
Added bonus log view for customer support.
2016-04-04 00:59:13 -05:00
543719b95d
More tutorial fixes
2016-04-04 14:47:33 +10:00
040026724b
renamed tutorials
2016-04-04 14:10:26 +10:00
29bcd6aeea
more text cahnges
2016-04-04 13:30:15 +10:00
88e56f2ffb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
2016-04-04 13:03:24 +10:00
6c92b42335
text changes
2016-04-04 13:01:54 +10:00
29f2442be8
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 12:53:07 +10:00
8dee8eab0a
Bug fixes
2016-04-04 12:52:52 +10:00
3173adca53
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 12:49:00 +10:00
5ad877f864
So many fixes <3
2016-04-04 12:47:23 +10:00
0a39b7b756
Fix objective ordering
2016-04-04 12:36:47 +10:00
e11a9379b9
More tutorial tweaking
2016-04-04 12:32:22 +10:00
5195e4a13d
Message fixes
2016-04-04 10:15:15 +10:00
c3a119cfe4
Display completion only to player who completes
2016-04-04 10:11:26 +10:00
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +01:00
3ff5e6d337
npc fixes
2016-04-03 18:47:31 +01:00
7558bd01b7
ensure zombies don't burn to death, by losing equipment
2016-04-03 18:29:13 +01:00
40361acc9b
fixed cannon becoming off-center
2016-04-03 17:51:56 +01:00
ccdd1f901f
cannon 1.9 fixes
2016-04-03 17:23:55 +01:00
f4d4b5c5df
siege weapon interaction fix
2016-04-03 14:08:40 +01:00
66a18dcc87
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-03 13:55:17 +01:00
c1b659e738
npcs on enemy base
2016-04-03 13:50:11 +01:00
f5623f00f9
blacklist npe fix
2016-04-03 13:47:57 +01:00
3ae347653a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 21:33:13 +10:00
c92d291e96
Shift clicking TNT into the cannon + iron doors fixed
2016-04-03 21:32:56 +10:00
8f58a456b1
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 01:37:40 -05:00
AlexTheCoder
William Burns
Keir Nellyer
LCastr0
xGamingDudex
phobia
cnr
Jonathan Williams
Shaun Bennett
Shaun Bennett
Joseph Prezioso Jr.
Ben
Conrad S
Keir Nellyer
Shaun Bennett
Cheese