Commit Graph

1595 Commits

Author SHA1 Message Date
samczsun d291521ad1 Clean up DonationManager 2016-12-14 19:52:13 -07:00
cnr fa0e42a918 Revert "Anticheat Logging #299"
This reverts commit cae9d2f67e.
2016-12-01 01:59:50 -06:00
cnr cae9d2f67e Anticheat Logging #299
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
2016-12-01 01:24:05 -06:00
AlexTheCoder 72669c7640 Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff 2016-12-01 01:20:18 -06:00
AlexTheCoder 26262479f6 Remove Smoke Bomb and Illusion from Clans 2016-11-25 00:41:47 -05:00
AlexTheCoder 0a458c150f Take a second crack at fixing invisibility across Arcade and Clans 2016-11-23 23:41:10 -05:00
AlexTheCoder e4a968759a Properly block placement of redstone-based blocks in Clans 2016-11-23 23:41:10 -05:00
AlexTheCoder 32c9900069 Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable 2016-11-23 23:41:10 -05:00
AlexTheCoder 18992efa5a Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation) 2016-11-23 23:41:10 -05:00
Shaun Bennett 3d5e61e0f1 Eternal Giveaway Fixes 2016-11-17 21:05:10 -05:00
Shaun Bennett cbc9aeedc6 Report Feature Improvements (#269)
Report Feature Improvements
2016-11-16 22:52:14 -05:00
AlexTheCoder 7d14b6073d Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map 2016-11-16 22:37:25 -05:00
AlexTheCoder 5e1fcabe36 Final changes for S2 2016-11-16 22:37:25 -05:00
AlexTheCoder a8e3a530c1 Prevent safely logging out in shop zones while tagged 2016-11-16 22:37:25 -05:00
AlexTheCoder 4a186a8dec Disable crafting of hoppers 2016-11-16 22:37:25 -05:00
AlexTheCoder a219a2d072 Fix TNT breaking bedrock, increase build height and add a minimum chest place height 2016-11-16 22:37:25 -05:00
AlexTheCoder 1535fcc38b Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks 2016-11-16 22:37:25 -05:00
AlexTheCoder 63ef68976c Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective 2016-11-16 22:37:25 -05:00
Keir Nellyer e0d05d3c87 PC-1140 Keep reports region-separated 2016-10-22 15:06:18 +01:00
samczsun 09fe7b736a Don't enable debugging 2016-10-19 22:38:39 -04:00
AlexTheCoder 66dfe06b34 Clean up bucket fixing in clans 2016-10-12 21:50:18 -04:00
AlexTheCoder 2ac7f72327 Fix clans water exploit and ruined pickaxe duping exploit 2016-10-12 21:50:18 -04:00
Alexander Meech 0caa84f703 Optimize Clan Banners (#221)
* Optimize BannerRepository.java

* Optimize banner loading in BannerManager.java

* Optimize banner loading in ClansManager.java

* Remove unnecessary runAsync

* Optimize Siege Weapon storage

* Forgot a ! in my while loop
2016-09-29 23:04:19 -04:00
Keir Nellyer b24429783b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-22 16:28:16 +01:00
samczsun 92a0d606d4 Fix timings 2016-09-21 21:37:57 -04:00
Keir Nellyer 2cdab061b6 PC-886 Move report bans over to punishment gui 2016-09-16 17:40:14 +01:00
Keir Nellyer acd63c90a1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
AlexTheCoder 8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
Keir Nellyer cd9423a8e4 De-couple chatsnap from report system 2016-08-27 22:21:56 +01:00
cnr 8617572980 Fix preferences menu interaction in Clans{,Hub} 2016-08-25 02:26:42 -05:00
TadahTech c9d14dc522 Update clans to new preferences. Remove debug messages. 2016-08-23 03:12:36 -05:00
cnr 5365f1269f Delay Anticheat enable in Clans
This ensure the anticheat has registered GameStartEvent before we fire
it
2016-08-18 20:46:24 -05:00
cnr 72ddfd5d85 Disable server spawn radius in Clans
Defer to the spawn claim area, instead
2016-08-18 20:44:01 -05:00
Keir Nellyer a8e891f247 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
2016-08-11 14:53:57 +01:00
cnr 7b1ac5ded2 Merge branch 'update/clans' into develop 2016-08-10 21:27:43 -04:00
samczsun 7de9da3d1c Complete rework of disguising and antihack hook
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.

Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.

Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines

The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
Alexander Meech 5fca64b86b Remove safezone requirement for observer mode 2016-08-09 15:10:45 -04:00
AlexTheCoder e5a96e8189 Fix incorrect casing in mapping outposts 2016-08-08 21:54:27 -04:00
AlexTheCoder 5a2871528f Small aesthetic change to ghasts 2016-08-07 18:53:35 -04:00
AlexTheCoder 73cb42c7ab Make outposts actually end after they expire 2016-08-07 18:53:23 -04:00
AlexTheCoder cce871b0e2 Stop runes being applied to stacks of items 2016-08-07 18:53:05 -04:00
AlexTheCoder 4e8ed68efd Stop bows from selling in stacks 2016-08-07 18:52:48 -04:00
AlexTheCoder 36e6c7ce33 Fix slight error in amplifier end messages 2016-08-07 18:52:21 -04:00
AlexTheCoder e16d88e52b Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode 2016-08-07 18:52:00 -04:00
AlexTheCoder 5985731909 Make block drop rate 30% like normal TNT 2016-08-07 17:55:38 -04:00
AlexTheCoder 36aa1f9317 Stop swords and bows from being sold in stacks 2016-08-07 15:02:23 -04:00
AlexTheCoder c5d979e5dc Remove unnecessary while loop 2016-08-06 03:08:29 -04:00
AlexTheCoder 8eb74de2e8 Make outposts not try to block all right clicking everywhere -.- 2016-08-05 21:34:31 -04:00
AlexTheCoder 4e0971ab0a Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-08-05 14:35:57 -04:00
AlexTheCoder 5b03692c97 Add in cooldowns for other clans shop buttons to stop autoclick exploits 2016-08-05 14:33:59 -04:00
AlexTheCoder 599c47a8c2 Prevent stacks of runes being consumed on one item 2016-08-05 14:33:21 -04:00
AlexTheCoder a56f72b6af Unify standard for event spawn points 2016-08-05 14:32:30 -04:00
AlexTheCoder 4637bc8531 Prevent war times from displaying as negative 2016-08-05 14:31:13 -04:00
AlexTheCoder 223fb0e526 Use custom explosion calculations as opposed to default mineplex explosion handling 2016-08-05 14:30:00 -04:00
AlexTheCoder d73ced0e87 Stop portals from spawning in mid-air 2016-08-05 14:28:49 -04:00
AlexTheCoder 6170f9df87 Actually enable create button by removing stray '!' 2016-08-05 14:27:07 -04:00
AlexTheCoder 027b6b3fc4 Prevent players from using /c home after recently being in combat 2016-08-05 14:25:47 -04:00
AlexTheCoder ce6a0b376c Prevent players using the gui to bypass join cooldowns 2016-08-05 14:24:56 -04:00
AlexTheCoder e01b57ceac Implement auto restart system for clans servers in off-peak times 2016-08-05 14:24:00 -04:00
AlexTheCoder ee1f2a7ef9 Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611) 2016-08-05 14:22:17 -04:00
Keir Nellyer 1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
cnr 3f0938815d Merge branch 'update/clans' into develop 2016-08-03 12:39:52 -04:00
AlexTheCoder fb3cfecc79 Move recharge handler 2016-08-02 20:44:09 -04:00
AlexTheCoder 4fdbb1fc9d Fix assorted bugs 2016-08-01 14:48:44 -04:00
AlexTheCoder cd237b8d3b Make players teleport to shops once they return to the nether 2016-07-30 17:42:57 -04:00
AlexTheCoder 2d39dbfb58 Move clans admin text 2016-07-30 17:34:03 -04:00
AlexTheCoder fe92633802 Add claim limit override for admin claiming 2016-07-30 16:49:39 -04:00
AlexTheCoder d1d366dcf8 Add a cooldown to clans shops to reduce chance of edge-case negative gold balances 2016-07-30 09:46:02 -04:00
Keir Nellyer bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
cnr d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
AlexTheCoder 62e0a39ee8 Fix some medium graphics issues 2016-07-28 23:28:47 -04:00
AlexTheCoder 841a44b8a6 Make clan create button functional 2016-07-28 21:02:04 -04:00
AlexTheCoder 16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -04:00
AlexTheCoder 853fe31fbe Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-28 19:11:39 -04:00
AlexTheCoder 47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
cnr a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
AlexTheCoder 4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder 639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
AlexTheCoder d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr 646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05:00
cnr dfbebe11f4 Use separate gold balances for each clans server 2016-07-27 15:52:07 -05:00
AlexTheCoder 031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
AlexTheCoder 6180bea5cc Update clans drop aesthetics and spawn/shop locations 2016-07-27 15:07:11 -04:00
cnr 167c0f2b5e Reimplement EnergyShopButton with new machinery 2016-07-27 13:52:03 -05:00
cnr 3cddf35d12 Refactor out legacy ConfirmationPage 2016-07-27 13:52:03 -05:00
cnr 3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
AlexTheCoder d162750aec Keep nether loaded if its not empty 2016-07-27 04:47:03 -04:00
AlexTheCoder ea3cb36d3a Clean up miniboss mobs after their chunk unloads 2016-07-27 04:43:00 -04:00
AlexTheCoder 85cf005eba Small clans economy changes 2016-07-26 22:33:19 -04:00
AlexTheCoder d98ca0ab3c Remove unused miniboss 2016-07-26 09:00:37 -04:00
AlexTheCoder bb5d766ba6 Patch war point evasion by committing suicide in safezones 2016-07-26 07:35:11 -04:00
AlexTheCoder 34d5fb5e24 Fix craters getting glitched in wilderness 2016-07-26 07:15:40 -04:00
AlexTheCoder 4df8de58a6 More javadocs 2016-07-26 05:51:42 -04:00
AlexTheCoder bf5e9f1d76 ADD JAVADOCS TO CLANS 2016-07-26 05:50:43 -04:00
AlexTheCoder 61eca3ced0 Removed auto disguising from clans hub and removed clans tnt protection 2016-07-26 00:54:31 -04:00
AlexTheCoder 7b358adba1 Prevent runed pickaxe from destroying the nether 2016-07-25 20:26:23 -04:00
AlexTheCoder a1fd021f8d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-25 10:59:38 -04:00
AlexTheCoder 6f0d21120e Serious tweaks to gameplay and begin documentation 2016-07-25 10:59:03 -04:00
AlexTheCoder 818ed4c9a9 Set up clans monetization features in the shop and fix some hardcoded names in core 2016-07-22 00:18:34 -04:00
AlexTheCoder 869dfc1dfa Finalize Amplifier system 2016-07-21 20:21:11 -04:00
TadahTech 5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05:00
AlexTheCoder 891a3231d8 Change banner GUI 2016-07-21 17:37:02 -04:00
AlexTheCoder 1f2b1557d5 Work on amplifiers and deleting banners when the clan is deleted 2016-07-21 13:20:45 -04:00
AlexTheCoder 1dedde41a8 Banners and beginning javadocs 2016-07-21 05:09:31 -04:00
AlexTheCoder 29d52ac075 More work on Nether 2016-07-20 10:42:24 -04:00
AlexTheCoder c58d226680 More work on Nether and Runes 2016-07-18 16:26:05 -04:00
AlexTheCoder 4238a1c385 Implement rune system and main nether minibosses 2016-07-17 07:14:08 -04:00
AlexTheCoder 98e88d1b77 Disable bosses not scheduled for initial releases 2016-07-16 22:00:38 -04:00
AlexTheCoder 08850d909f Further work on brood mother boss and nether 2016-07-16 21:59:03 -04:00
AlexTheCoder 2034b5536e Update and enable Clans Freezing 2016-07-13 09:42:46 -04:00
AlexTheCoder 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
AlexTheCoder d3270b9289 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-11 14:50:16 -04:00
AlexTheCoder 0be317e5be Implement tweaks and finalize implementations for bosses and fix loot dropping bugs 2016-07-11 11:36:48 -04:00
Keir Nellyer 5c83f09456 SnapshotRepository no longer extends MinecraftRepository
It doesn't need to.
2016-07-08 23:26:33 -04:00
xGamingDudex 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
Keir Nellyer 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
Keir Nellyer 0dc17bf6fa Further code cleanup 2016-07-07 18:12:52 -04:00
AlexTheCoder b409009069 Create a way to remove siege weapons for testing 2016-07-05 10:05:53 -04:00
AlexTheCoder cc7fc164bb Implement Necromancer boss and give it some beginning attacks 2016-07-05 07:52:21 -04:00
AlexTheCoder 37d11cdd60 Make Meridian Scepter stronger 2016-07-03 05:41:59 -04:00
AlexTheCoder d0a8ee18c0 Fix concurrent modification error caused by poison looping every tick 2016-07-02 19:07:55 -04:00
samczsun ceb62f8dc9 Fix lore 2016-07-02 18:41:20 -04:00
AlexTheCoder b3c230082a Allowed Meridian Scepter to damage non-player entities 2016-07-02 18:34:35 -04:00
AlexTheCoder 32c91e2e0c Make start command more informative 2016-07-02 17:52:04 -04:00
samczsun 1655811d43 Added help messages to WorldEvent command 2016-07-02 17:47:13 -04:00
samczsun 54cda56c11 Initial Commit 2016-07-02 17:16:42 -04:00
LCastr0 050ae75e49 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-02 13:33:33 -03:00
xGamingDudex 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
samczsun 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
LCastr0 24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
Keir Nellyer 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
Shaun Bennett 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
Shaun Bennett a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
cnr 3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
samczsun a33b070ae7
Deny placing skulls 2016-06-23 15:34:29 -04:00
LCastr0 7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
samczsun 956cfeac44
Don't recall if player is dead, show UUID for custom items 2016-06-22 21:14:50 -04:00
samczsun 14c6c4215c
Silent chest opening! 2016-06-22 21:12:24 -04:00
samczsun 032b6a77c0
Display UUID for CMod+ 2016-06-22 21:12:24 -04:00
samczsun 2e1bb25b0b
Fix exceptions 2016-06-22 21:12:24 -04:00
Keir Nellyer a795ee3d0f Fix feature initialisation code 2016-06-23 01:18:16 +01:00
Keir Nellyer 09a74e3772 Work on pushing chat snapshots to db 2016-06-23 00:38:24 +01:00
Keir Nellyer 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
samczsun 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
samczsun 5c2a9d5807
Prefixes are too long or something 2016-06-15 21:52:25 -04:00
samczsun 2d8b7f4ecd
Cleanse lore 2016-06-15 21:52:25 -04:00
samczsun 18d7eba9db
Let's not eagerly delete clans 2016-06-15 21:52:25 -04:00
samczsun 5564b07a36
Remove unnecessary serializations 2016-06-15 21:52:25 -04:00
samczsun 9933345a7b
Remove debug messages 2016-06-15 21:52:25 -04:00
samczsun 67f4361959
Cleanup CustomItems after a while 2016-06-15 21:52:25 -04:00
samczsun 1e5d91e392
Make porting from old legendaries work, fix null commandcenter 2016-06-15 21:52:25 -04:00
samczsun d49ce27a1b
Make GearShop work again 2016-06-15 21:52:25 -04:00
samczsun 808e506911
Revert "Revert "Clans optimizations""
This reverts commit 25a315ac05.
2016-06-15 21:52:25 -04:00
samczsun 45e6cb902f
Save changes 2016-06-15 21:52:25 -04:00
samczsun a753a3ab07
Clean up legendary code 2016-06-15 21:52:25 -04:00
Keir Nellyer 197acee4ae Implement server weighting 2016-06-11 13:47:45 +01:00
Keir Nellyer 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
Shaun Bennett d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
LCastr0 2410151371 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-05 17:46:27 -03:00
LCastr0 cb71bf4ba5 Removes morphs from gadget persistence (PC-429) 2016-06-05 17:44:34 -03:00
samczsun fdf500b090 Allow opening chest in incognito... silently! 2016-06-04 23:54:13 -04:00
samczsun 3444c9c7d7 Remove anti-fly-kick 2016-06-04 23:54:13 -04:00
samczsun dc419cb53c Add /speed command 2016-06-04 23:54:13 -04:00
samczsun 15a1a63c15 Add try/catch to render map just in case 2016-06-04 23:54:13 -04:00
samczsun 64e1288ba2 Add nullcheck to WarPointEvasion 2016-06-04 23:54:13 -04:00
samczsun f9826abc1e Make field in MeridianScepter transient 2016-06-04 23:54:13 -04:00
samczsun dbf61c5652 Set walk speed on join 2016-06-04 23:54:13 -04:00
LCastr0 c5cbca3ed0 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-02 18:30:22 -03:00
samczsun f7adf731a9
Delete query command 2016-06-01 16:17:17 -04:00
cnr 25a315ac05 Revert "Clans optimizations"
This reverts commit 89da8790bf.
2016-06-01 00:58:58 -05:00
Shaun Bennett e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Keir Nellyer 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
Keir Nellyer 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
xGamingDudex 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
xGamingDudex 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
LCastr0 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
samczsun 84276f68a0 Change help message rank 2016-05-26 14:29:13 -05:00
samczsun f7e0bc7d16 Don't log if culled is 0 2016-05-26 14:29:13 -05:00
samczsun 0794761435 Forgot a nullcheck 2016-05-26 14:29:13 -05:00
samczsun daf1d1a9ba Fix duplication glitch using fissure 2016-05-26 14:29:12 -05:00
Sam Sun ef0dcdb0df Bump invsee required rank too 2016-05-26 10:24:50 -05:00
Sam Sun 1bf8ccfc43 Bump worldevent required rank 2016-05-26 10:24:50 -05:00
samczsun 9da9dce398
Fix mimic, allow chests and invite. Fixes PC-375 2016-05-24 16:40:25 -04:00
samczsun 2991bec44d
Fix listener priorities (again). Fixes PC-370 2016-05-24 16:04:15 -04:00
samczsun 2680c2b244
Don't apply attributes on friendlies. Fixes PC-369 2016-05-24 15:58:44 -04:00
samczsun 9acdbd7cbe
Don't allow placing banners and string. Fixes PC-333 2016-05-24 15:38:03 -04:00
Sam Sun 9853ef824e QA Pass #2 - Comment WorldManager, optimize searching 2016-05-24 12:24:14 -05:00
AlexTheCoder 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
samczsun 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
samczsun 2f993dbe66 Fix Wind Blade, Hyper Axe 2016-05-24 13:15:29 -04:00
samczsun 4ba3148df7 Finish invsee 2016-05-24 13:15:29 -04:00
samczsun ec0e1b9849 New invsee implementation 2016-05-24 13:15:29 -04:00
samczsun 63e3cc8e12 Add nullcheck 2016-05-24 13:15:29 -04:00
samczsun d8b5dba3fc Fix Meridian Scepter 2016-05-24 13:15:29 -04:00
AlexTheCoder 1dc5a0d712 Revamped Meridian Scepter attack 2016-05-24 13:15:29 -04:00
samczsun 981bed5e37 Limit clan searching. Fixes PC-331 2016-05-24 13:15:29 -04:00
samczsun e0f4c9cbc8 Update Broadsword regen 2016-05-24 13:15:29 -04:00
samczsun 41846f835d Bump listener priority, change wording. Fixes PC-308 2016-05-24 13:15:29 -04:00
samczsun c172d226c4 Add bypass for testing servers to skip tutorials 2016-05-24 13:15:29 -04:00
samczsun 08784d3f0a Ignore float kick for Wind Blade. Fixes PC-314 2016-05-24 13:15:29 -04:00
samczsun 786c60537e Remove /c trust from help. Fixes PC-280 2016-05-24 13:15:29 -04:00
Sam Sun cd0e59087a Don't drop items from hidden slimes. Fixes PC-276 2016-05-24 13:15:29 -04:00
samczsun 9141ed645a Fix fissure anvil repair exploit. Fixes PC-312 2016-05-24 13:15:29 -04:00
samczsun ea43dca9af Don't allow placing TNT in tutorial. Fixes PC-307 2016-05-24 13:15:29 -04:00
samczsun d29d5dd5e4 Actually fix PC-279 2016-05-24 13:15:29 -04:00
samczsun 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
samczsun 7c66c98338 Clean up Farming 2016-05-24 13:15:29 -04:00
samczsun 173a6bb143 Delete IncognitoHidePlayerEvent 2016-05-24 13:15:29 -04:00
samczsun 2675789f59 Compare commands with equals. Fixes PC-116 2016-05-24 13:15:29 -04:00
Shaun Bennett 434ada2e86 Fix merge issues 2016-05-24 19:14:52 +10:00
LCastr0 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
Ben 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
cnr 6042be2d2f Refactor clans ban functionality and remove UtilStreams 2016-05-17 05:57:27 -05:00
cnr f5cf751622 Revert "Temporarily disable clans ban functionality"
This reverts commit b47c49d93b.
2016-05-17 05:51:18 -05:00
samczsun 1fc4239b89 Determine whether Ice Prison target is valid. Fixes PC-281 2016-05-16 15:44:22 -05:00
AlexTheCoder de1fabf53d Disable report system as it is not ready to go live 2016-05-09 02:10:51 -04:00
cnr 4aa44cd796 Merge branch 'develop' into clans/beta 2016-05-08 16:53:48 -05:00
cnr 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
phobia 38f22b1577 Disable obsidian dropping after breaking THE BLOCK 2016-05-07 19:51:19 +10:00
Keir Nellyer a663cb3e01 Revert "Revert "Report system (version 1)""
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-05-04 15:24:29 +01:00
cnr 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
Ben 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
Ben 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
Ben 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
Ben 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
Ben e139bea465 Fix kill messages inserting a space below them in chat. 2016-05-01 23:03:18 +01:00
Ben eae972a3e6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 10:11:28 +01:00
Ben 9d97ea8d1e Missing Clans ban cache class (to do with the commit previously by me) 2016-05-01 10:11:17 +01:00
cnr 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
Ben 189f9ad524 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 01:42:32 +01:00
Ben 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
cnr 8ca38b2598 Prepend http:// to resource pack locations 2016-04-30 18:54:17 -05:00
cnr 10166f063b Merge branch 'develop' into clans/beta 2016-04-30 16:16:57 -05:00
phobia 14204fba5c Changed resource packs to home hosted ones 2016-04-30 16:02:26 -05:00
phobia 890ab9f67e Uncommented ClansBanManager's instances 2016-04-30 16:02:26 -05:00
phobia f1c2e71d56 Some changes to error handlng for clans regions 2016-04-30 16:02:26 -05:00
cnr 634a34dd52 Reintroduce non-Air constraint to cannon explosion 2016-04-30 16:02:26 -05:00
cnr 2eb7b892e0 Refactor cannon explosion effect for clarity 2016-04-30 16:02:26 -05:00
cnr 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
Conrad d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Keir Nellyer 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
Keir Nellyer 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
phobia f63a872bd4 Changed resource packs to home hosted ones 2016-04-29 14:46:14 +10:00
phobia c814fc73f7 Uncommented ClansBanManager's instances 2016-04-29 12:53:20 +10:00
AlexTheCoder 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
Keir Nellyer 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
phobia b21939444c Some changes to error handlng for clans regions 2016-04-23 16:40:39 +10:00
Jonathan Williams d73b720323 Merge branch 'features/elo' into develop 2016-04-22 04:34:35 -05:00
cnr 4227e24ae0 Reintroduce non-Air constraint to cannon explosion 2016-04-17 16:29:23 -05:00