a1fd021f8d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-25 10:59:38 -04:00
6f0d21120e
Serious tweaks to gameplay and begin documentation
2016-07-25 10:59:03 -04:00
818ed4c9a9
Set up clans monetization features in the shop and fix some hardcoded names in core
2016-07-22 00:18:34 -04:00
869dfc1dfa
Finalize Amplifier system
2016-07-21 20:21:11 -04:00
5d0b5f80c0
Fix Party server sending. Tweak playercount and GUI display
2016-07-21 18:01:43 -05:00
891a3231d8
Change banner GUI
2016-07-21 17:37:02 -04:00
1f2b1557d5
Work on amplifiers and deleting banners when the clan is deleted
2016-07-21 13:20:45 -04:00
1dedde41a8
Banners and beginning javadocs
2016-07-21 05:09:31 -04:00
29d52ac075
More work on Nether
2016-07-20 10:42:24 -04:00
c58d226680
More work on Nether and Runes
2016-07-18 16:26:05 -04:00
4238a1c385
Implement rune system and main nether minibosses
2016-07-17 07:14:08 -04:00
98e88d1b77
Disable bosses not scheduled for initial releases
2016-07-16 22:00:38 -04:00
08850d909f
Further work on brood mother boss and nether
2016-07-16 21:59:03 -04:00
2034b5536e
Update and enable Clans Freezing
2016-07-13 09:42:46 -04:00
f0db20dbc2
Fix some minor spelling and grammar issues and implement a requested player freezing system for Clans
2016-07-12 05:21:50 -04:00
d3270b9289
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-11 14:50:16 -04:00
0be317e5be
Implement tweaks and finalize implementations for bosses and fix loot dropping bugs
2016-07-11 11:36:48 -04:00
5c83f09456
SnapshotRepository no longer extends MinecraftRepository
...
It doesn't need to.
2016-07-08 23:26:33 -04:00
5349d26115
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-07-08 03:41:13 +02:00
cb555a41ab
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-07 20:47:19 -04:00
0dc17bf6fa
Further code cleanup
2016-07-07 18:12:52 -04:00
b409009069
Create a way to remove siege weapons for testing
2016-07-05 10:05:53 -04:00
cc7fc164bb
Implement Necromancer boss and give it some beginning attacks
2016-07-05 07:52:21 -04:00
37d11cdd60
Make Meridian Scepter stronger
2016-07-03 05:41:59 -04:00
d0a8ee18c0
Fix concurrent modification error caused by poison looping every tick
2016-07-02 19:07:55 -04:00
ceb62f8dc9
Fix lore
2016-07-02 18:41:20 -04:00
b3c230082a
Allowed Meridian Scepter to damage non-player entities
2016-07-02 18:34:35 -04:00
32c91e2e0c
Make start command more informative
2016-07-02 17:52:04 -04:00
1655811d43
Added help messages to WorldEvent command
2016-07-02 17:47:13 -04:00
54cda56c11
Initial Commit
2016-07-02 17:16:42 -04:00
050ae75e49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-07-02 13:33:33 -03:00
6d9e84b817
Merge branch 'develop' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
045e1b3064
Fix various Clans bugs
...
Viper destroying armor
Legendaries not saving properly
Combat log NPC for vanished players
2016-06-30 05:20:44 -05:00
24186d9992
More fixes for gadget persistence
2016-06-28 18:11:00 -03:00
323d865b57
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-06-24 18:13:51 +01:00
fd843b88cb
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
a9f291338f
Amplifiers GM Candidate
2016-06-23 22:49:12 -07:00
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
a33b070ae7
Deny placing skulls
2016-06-23 15:34:29 -04:00
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
956cfeac44
Don't recall if player is dead, show UUID for custom items
2016-06-22 21:14:50 -04:00
14c6c4215c
Silent chest opening!
2016-06-22 21:12:24 -04:00
032b6a77c0
Display UUID for CMod+
2016-06-22 21:12:24 -04:00
2e1bb25b0b
Fix exceptions
2016-06-22 21:12:24 -04:00
a795ee3d0f
Fix feature initialisation code
2016-06-23 01:18:16 +01:00
09a74e3772
Work on pushing chat snapshots to db
2016-06-23 00:38:24 +01:00
f34c65111b
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-18 00:48:00 +01:00
01409af5bd
Fix misc bugs
...
Change UtilServer to return proper plugin instance
Remove /energyshop debug command
Add warning for opening chests while in vanish
Fix item maps being broken
Fix tutorials possibly wiping inventory
Make the project compile
2016-06-16 16:39:43 -04:00
5c2a9d5807
Prefixes are too long or something
2016-06-15 21:52:25 -04:00
2d8b7f4ecd
Cleanse lore
2016-06-15 21:52:25 -04:00
18d7eba9db
Let's not eagerly delete clans
2016-06-15 21:52:25 -04:00
5564b07a36
Remove unnecessary serializations
2016-06-15 21:52:25 -04:00
9933345a7b
Remove debug messages
2016-06-15 21:52:25 -04:00
67f4361959
Cleanup CustomItems after a while
2016-06-15 21:52:25 -04:00
1e5d91e392
Make porting from old legendaries work, fix null commandcenter
2016-06-15 21:52:25 -04:00
d49ce27a1b
Make GearShop work again
2016-06-15 21:52:25 -04:00
808e506911
Revert "Revert "Clans optimizations""
...
This reverts commit 25a315ac05
2016-06-15 21:52:25 -04:00
45e6cb902f
Save changes
2016-06-15 21:52:25 -04:00
a753a3ab07
Clean up legendary code
2016-06-15 21:52:25 -04:00
197acee4ae
Implement server weighting
2016-06-11 13:47:45 +01:00
8e48b00264
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-09 15:16:38 +01:00
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05:00
2410151371
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-05 17:46:27 -03:00
cb71bf4ba5
Removes morphs from gadget persistence (PC-429)
2016-06-05 17:44:34 -03:00
fdf500b090
Allow opening chest in incognito... silently!
2016-06-04 23:54:13 -04:00
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
4fc3c491f8
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-05-28 02:04:27 +02:00
02863d4a6a
Updated some of the Mavericks reposetory to use place instead of won
...
This also implements a small schematic tester inside the Mavericks Game.
Converted some NautHashMaps into regular HashMaps
2016-05-28 01:23:14 +02: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
AlexTheCoder
TadahTech
Keir Nellyer
xGamingDudex
samczsun
LCastr0
Shaun Bennett
cnr
Sam Sun
Ben
phobia
Conrad