3444c9c7d7
Remove anti-fly-kick
2016-06-04 23:54:13 -04:00
dc419cb53c
Add /speed command
2016-06-04 23:54:13 -04:00
15a1a63c15
Add try/catch to render map just in case
2016-06-04 23:54:13 -04:00
64e1288ba2
Add nullcheck to WarPointEvasion
2016-06-04 23:54:13 -04:00
f9826abc1e
Make field in MeridianScepter transient
2016-06-04 23:54:13 -04:00
dbf61c5652
Set walk speed on join
2016-06-04 23:54:13 -04:00
c5cbca3ed0
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-02 18:30:22 -03:00
f7adf731a9
Delete query command
2016-06-01 16:17:17 -04:00
25a315ac05
Revert "Clans optimizations"
...
This reverts commit 89da8790bf
2016-06-01 00:58:58 -05:00
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05:00
075c2d21e9
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-05-29 00:27:48 +01:00
20038f9e64
Massive changes made to how the report feature functions
...
Re-enabled report feature (merge from develop disabled it).
Moved reports from Redis to MySQL.
Made everything asynchronous.
Many many other miscellaneous changes.
Bugs will now be worked out and then this should be ready for QA testing
2016-05-29 00:25:26 +01:00
255191f01a
Changed gadget persistence to use Player Key/Value system (Thanks to Connor)
...
Changed the method names for some classes
2016-05-26 23:58:36 -03:00
84276f68a0
Change help message rank
2016-05-26 14:29:13 -05:00
f7e0bc7d16
Don't log if culled is 0
2016-05-26 14:29:13 -05:00
0794761435
Forgot a nullcheck
2016-05-26 14:29:13 -05:00
daf1d1a9ba
Fix duplication glitch using fissure
2016-05-26 14:29:12 -05:00
ef0dcdb0df
Bump invsee required rank too
2016-05-26 10:24:50 -05:00
1bf8ccfc43
Bump worldevent required rank
2016-05-26 10:24:50 -05:00
9da9dce398
Fix mimic, allow chests and invite. Fixes PC-375
2016-05-24 16:40:25 -04:00
2991bec44d
Fix listener priorities (again). Fixes PC-370
2016-05-24 16:04:15 -04:00
2680c2b244
Don't apply attributes on friendlies. Fixes PC-369
2016-05-24 15:58:44 -04:00
9acdbd7cbe
Don't allow placing banners and string. Fixes PC-333
2016-05-24 15:38:03 -04:00
9853ef824e
QA Pass #2 - Comment WorldManager, optimize searching
2016-05-24 12:24:14 -05:00
b952de856e
Add a description for the Magnetic Maul and switch ConcurrentHashMap to HashMap in the Meridian Scepter
2016-05-24 13:15:29 -04:00
f32e648691
QA Pass #1
...
Remove potential main thread IO in ItemMapManager
Don't construct search string if limit is reached
Also cleaned up WorldManager to be more efficient
2016-05-24 13:15:29 -04:00
2f993dbe66
Fix Wind Blade, Hyper Axe
2016-05-24 13:15:29 -04:00
4ba3148df7
Finish invsee
2016-05-24 13:15:29 -04:00
ec0e1b9849
New invsee implementation
2016-05-24 13:15:29 -04:00
63e3cc8e12
Add nullcheck
2016-05-24 13:15:29 -04:00
d8b5dba3fc
Fix Meridian Scepter
2016-05-24 13:15:29 -04:00
1dc5a0d712
Revamped Meridian Scepter attack
2016-05-24 13:15:29 -04:00
981bed5e37
Limit clan searching. Fixes PC-331
2016-05-24 13:15:29 -04:00
e0f4c9cbc8
Update Broadsword regen
2016-05-24 13:15:29 -04:00
41846f835d
Bump listener priority, change wording. Fixes PC-308
2016-05-24 13:15:29 -04:00
c172d226c4
Add bypass for testing servers to skip tutorials
2016-05-24 13:15:29 -04:00
08784d3f0a
Ignore float kick for Wind Blade. Fixes PC-314
2016-05-24 13:15:29 -04:00
786c60537e
Remove /c trust from help. Fixes PC-280
2016-05-24 13:15:29 -04:00
cd0e59087a
Don't drop items from hidden slimes. Fixes PC-276
2016-05-24 13:15:29 -04:00
9141ed645a
Fix fissure anvil repair exploit. Fixes PC-312
2016-05-24 13:15:29 -04:00
ea43dca9af
Don't allow placing TNT in tutorial. Fixes PC-307
2016-05-24 13:15:29 -04:00
d29d5dd5e4
Actually fix PC-279
2016-05-24 13:15:29 -04:00
89da8790bf
Clans optimizations
...
Key notes:
* RAM usage decreased on startup
* Startup speed much quicker
* Map is entirely rendered on startup
Details:
Changed TutorialWorldManager Stack -> LinkedList because no need for
synchronization
Documented map methods and magic numbers
Remove loading all chunks on startup
Render map on startup
Optimize map rendering by replacing ArrayList with LinkedList
Optimize map rendering by reading chunk directly from disk and caching to
prevent entity ticking
Optimize map rendering by using a global BlockPosition
Save results for showing zoom
2016-05-24 13:15:29 -04:00
7c66c98338
Clean up Farming
2016-05-24 13:15:29 -04:00
173a6bb143
Delete IncognitoHidePlayerEvent
2016-05-24 13:15:29 -04:00
2675789f59
Compare commands with equals. Fixes PC-116
2016-05-24 13:15:29 -04:00
434ada2e86
Fix merge issues
2016-05-24 19:14:52 +10:00
ed68ef332b
Fixes for Win Room (Players were able to see other players)
...
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
35c7b9a2bd
Incognito Updates:
...
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
6042be2d2f
Refactor clans ban functionality and remove UtilStreams
2016-05-17 05:57:27 -05:00
f5cf751622
Revert "Temporarily disable clans ban functionality"
...
This reverts commit b47c49d93b
2016-05-17 05:51:18 -05:00
1fc4239b89
Determine whether Ice Prison target is valid. Fixes PC-281
2016-05-16 15:44:22 -05:00
de1fabf53d
Disable report system as it is not ready to go live
2016-05-09 02:10:51 -04:00
4aa44cd796
Merge branch 'develop' into clans/beta
2016-05-08 16:53:48 -05:00
b47c49d93b
Temporarily disable clans ban functionality
...
This can be reverted when clans bans are properly audited/fixed/tested.
2016-05-07 19:02:19 -05:00
38f22b1577
Disable obsidian dropping after breaking THE BLOCK
2016-05-07 19:51:19 +10:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
57fca2a8d0
Temporarily(?) mitigate spigot CME
...
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
2016-05-03 04:56:31 -05:00
cd2bd8ac1d
Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever.
2016-05-02 11:49:56 +01:00
8a1b5572a8
Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.
2016-05-02 10:31:45 +01:00
026ab15099
Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned.
2016-05-01 23:20:55 +01:00
480cc0f9be
Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand.
2016-05-01 23:04:30 +01:00
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
eae972a3e6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 10:11:28 +01:00
9d97ea8d1e
Missing Clans ban cache class (to do with the commit previously by me)
2016-05-01 10:11:17 +01:00
4cffb39941
Delay dismount teleport by one tick
...
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
2337e89a93
Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.
2016-05-01 01:42:11 +01:00
8ca38b2598
Prepend http:// to resource pack locations
2016-04-30 18:54:17 -05:00
10166f063b
Merge branch 'develop' into clans/beta
2016-04-30 16:16:57 -05:00
14204fba5c
Changed resource packs to home hosted ones
2016-04-30 16:02:26 -05:00
890ab9f67e
Uncommented ClansBanManager's instances
2016-04-30 16:02:26 -05:00
f1c2e71d56
Some changes to error handlng for clans regions
2016-04-30 16:02:26 -05:00
634a34dd52
Reintroduce non-Air constraint to cannon explosion
2016-04-30 16:02:26 -05:00
2eb7b892e0
Refactor cannon explosion effect for clarity
2016-04-30 16:02:26 -05:00
f2f627116a
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-30 16:02:26 -05:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -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
f63a872bd4
Changed resource packs to home hosted ones
2016-04-29 14:46:14 +10:00
c814fc73f7
Uncommented ClansBanManager's instances
2016-04-29 12:53:20 +10: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
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
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10:00
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
d75d63a81a
some missing files and blacklist barrier block from block toss
2016-04-06 18:26:56 +01: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
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
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
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
7de23216f6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 20:41:10 +01:00
samczsun
LCastr0
cnr
Shaun Bennett
Keir Nellyer
Sam Sun
AlexTheCoder
Ben
phobia
Conrad
Jonathan Williams
Joseph Prezioso Jr.
Conrad S
Keir Nellyer
Shaun Bennett