Commit Graph
67 Commits
Author SHA1 Message Date
IronApollo 33c3cb2f33 Revert portion of "Minor cleanup" to fix history bugs 2020-06-13 14:54:07 -04:00
IronApollo 238c56a3c6 Revert "Revert matt's changes"
This reverts commit bfcc6184ad.
2020-06-13 14:41:36 -04:00
IronApollo 34d40cb856 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-05-13 17:45:17 -04:00
IronApollo 376bbe1bdb Edit change count to default to 0 instead of -1
Why was it ever defaulted to -1?
2020-05-13 17:45:11 -04:00
IronApollo 8b1a0bbc34 Fix #417
This commit aims to fix existing issues regarding the "0/-1 blocks affected" bug. Introducing the new LinkedFilter class allows us to use multiple filters for single-filter operations, e.g. applying a pattern to blocks while also counting the amount of blocks applied to. SetFilter.java was also removed due to not being used.
2020-05-07 12:29:18 -04:00
IronApollo 6dec0ab2ba Override #equals method in AbstractRegion.java
This is an attempt to fix CPU spikes which do not reduce and continue mounting until the server reaches ~300%-500% usage. This override should allow prompt equality checks for regions based on the world, the minimum point, the maximum point, and area covered by the region.

Issues found regarding this change should be quickly reported so this can be reverted and replaced with another appropriate solution.
2020-05-03 19:51:48 -04:00
IronApollo 65afa79c17 Remove WorldguardFlag.java
The main functionality of WorldguardFlag.java was ported to Worldguard.java. This *shouldn't* break functionality of either the Worldguard or WorldguardFlag features, but users should be cautious and provide prompt feedback if any unintended changes are found.
2020-05-03 19:45:04 -04:00
IronApollo aae760c625 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-04-29 14:17:48 -04:00
IronApollo 8247f78e9d Override hashCode method in AbstractRegion
This commit fixes the PlotSquared issue where running a PlotSquared command could result in intense lag on the main thread. This was mainly seen with running the /p info command on an extremely large plot.

Since #world can be null, the uniqueness of this hashCode is not the best, but since it's essentially just a collection of BlockVector3's, I don't believe this change will break anything. If it does, please let me know! Feedback on the uniqueness of this is welcomed.
2020-04-29 14:17:05 -04:00
Josh KnightandGitHub 915fa5f00c Merge pull request #416 from Sauilitired/tile-entity
Properly remove tile entities in BukkitGetBlocks_1_15_2
2020-04-22 14:57:49 -04:00
IronApollo 8b97a11fa4 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-04-16 20:27:47 -04:00
IronApollo e1ba16b699 Fix #403 2020-04-16 20:27:38 -04:00
IronApollo 755ea09797 Fix #390
Turns out the FilterBlock's getOrdinal value is from the "get", and does not share the same reference as setOrdinal, whose value is from the "set", would modify.

Because of this, even if #getOrdinal returns 0, we still must update the set with 0 by #setOrdinal.
2020-04-01 00:26:11 -04:00
IronApollo 16df4abd18 Reflection field name changes
Old ones were outdated. Brush visualization is still WIP and can result in client being kicked from the server for bad packets.
2020-04-01 00:20:25 -04:00
IronApollo 110347214e Update SingleThreadQueueExtent.java 2020-03-31 20:29:03 -04:00
Josh KnightandGitHub 8597ab1ce8 Merge pull request #382 from ForceUpdate1/1.15
Fixing that the PlayerDropItemEvent was not fired
2020-03-29 19:34:51 -04:00
Josh KnightandGitHub 5f3d6cdc79 Merge pull request #384 from xCykrix/1.15
Correct JVM Architecture Detection
2020-03-29 19:33:37 -04:00
Josh KnightandGitHub c88764b14c Merge pull request #383 from ForceUpdate1/lang
Fixing wrong translation keys
2020-03-29 19:29:07 -04:00
IronApollo 8c7d4c0cc5 Fix #377
- Added comments to help explain some of the logic of the Region/CuboidRegion filtering
2020-03-28 20:51:53 -04:00
IronApollo 46d24fff0f Update AsyncWorld.java 2020-03-26 17:11:07 -04:00
IronApollo fa738504a8 Fix some important chunk issues
This commit should properly synchronize the initialization of the adapter's ibdToStateOrdinal (the char array FAWE uses to convert NMS IBlockData objects to an internal ordinal for chunk operations) so references to this array do not push incorrect characters down the line.

Potentially fixes #373
Fixes #363
Fixes #332
2020-03-26 16:08:36 -04:00
Josh KnightandGitHub f3aa8c5b9a Merge pull request #349 from BrodyBeckwith/walls
Fix cuboid wall creation
2020-03-02 17:06:40 -05:00
IronApollo 8535bc859a Fix #347 2020-02-27 14:14:01 -05:00
IronApollo d2bcc6dd35 Fix #346 , minor hook changes
- Removed deprecated FaweMaskManager#getMask(Player)
- Removed deprecated constructor FaweMask(BlockVector3, BlockVector3)
2020-02-26 10:17:11 -05:00
IronApollo 12431e7b7a Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-02-26 09:35:47 -05:00
IronApollo de4cb586eb Fix PlotSquared hook 2020-02-26 09:35:41 -05:00
Josh KnightandGitHub d9bae5f157 Merge pull request #345 from Spottedleaf/workaround-visiblechunks
Workaround for replacing PlayerChunkMap#visibleChunks field
2020-02-22 23:32:44 -05:00
IronApollo 14ac3205ce Check for PlotSquared before initializing the feature class
Some users are experiencing issues during startup with FAWE not finding PlotSquared resulting in errors.
2020-02-22 21:02:12 -05:00
IronApollo 3a050fba3b Fix immediate crash for some users 2020-02-21 18:26:43 -05:00
IronApollo c9aebf17d8 Fix #320 ; optimize adapter imports 2020-02-20 21:28:28 -05:00
IronApollo 4f3db6f3da Attempted fix for #329
Removing this code seemed to fix the issue while not breaking general editing abilities. Needs testing to determine any unintended side effects!
2020-02-01 20:28:48 -05:00
IronApollo 83bb3966ca Update adapter to 1.15.2
Adapter updated to 1.15.2, mostly a clone of 1.15 / 1.15.1's adapter. I encountered no issues from this, but the field names for our reflections may need to be double-checked for accuracy in this Minecraft version.
2020-02-01 20:11:02 -05:00
IronApollo e2c2205dac Hollow fix 2019-06-08 14:48:30 -04:00
IronApollo 3236bdd78e Changes to NBT-handling in operations and extents, changes to match the widely supported setBlock functionality, minor code cleanup 2019-03-25 13:42:11 -04:00
Josh KnightandGitHub 16c22b75da Merge pull request #79 from IntellectualSites/remove-plotme-support
Remove PlotMe support
2019-03-25 06:09:50 -04:00
Josh KnightandGitHub 4c3b09895d Merge pull request #76 from IntellectualSites/new-vector-system2
Revert "Make end tag singleton"
2019-03-25 06:09:13 -04:00
Josh KnightandGitHub feaf848e26 Merge pull request #73 from IntellectualSites/fix-center
Fixes #17, and an annoying typo in SnipeData :)
2019-03-21 08:32:08 -04:00
Josh KnightandGitHub e758e6c1a2 Merge pull request #65 from aurorasmiles/new-vector-system
(dirty) Fix for VaultAPI build issue
2019-03-20 01:12:43 -04:00
Josh KnightandGitHub 83bdb3c8e8 Merge pull request #11 from IntellectualSites/incendo-paste
Make debugpaste use Incendo Paste Viewer, rather than Hastebin.
2019-03-19 10:36:21 -04:00
IronApollo c98a311146 Update to working PlotSquared repo; Update to PlotSquared C>Captions class rename; Cleaning and minor modifications to SpongeSchematicReader 2019-03-06 03:06:47 -05:00
IronApollo 0fa9d7a4a7 Changes to EditSession to improve upstream compatibility 2019-02-27 09:01:07 -05:00
IronApollo 3ffb5ff00d Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing 2019-02-27 08:09:04 -05:00
IronApollo 24fbc86cdd INDEV -- Pushed for in-house testing and development 2019-02-17 03:47:32 -05:00
IronApollo 0763e4c05c Pull changes from upstream to match cdd7117 2019-02-07 09:11:51 -05:00
IronApollo 511c279153 Fixed issues regarding block transformations and using the BaseBlock to apply a function. 2019-02-07 09:04:14 -05:00
IronApollo 0e5847e1ce Various fixes 2019-02-03 09:22:10 -05:00
IronApollo 2d586ff53e Registry changes & additions 2019-02-03 08:53:04 -05:00
Josh KnightandGitHub be41e8dea0 Merge pull request #35 from Gerrygames/master
fix NPE when reading sponge schematics with tile entities or entities
2019-02-01 08:47:35 -05:00
IronApollo e53535319d Plenty of changes to core block behavior to become more compatible with upstream WorldEdit (still more to be done!) 2019-01-31 10:08:58 -05:00
IronApollo 271b45f3ba Final changes for the Vector update (probable fix for the "copying player entity" bug) 2019-01-17 05:23:47 -05:00
IronApollo cd1d45b856 Updated Paper-API to 1.13.2, minor edits to FastAsyncVoxelSniper 2019-01-16 07:12:02 -05:00
IronApollo 62e6e9de96 Some general changes to the handling of blocks 2019-01-14 05:49:05 -05:00
IronApollo f74381b93f Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system 2019-01-13 02:00:14 -05:00
IronApollo 90b3439dc2 Even more changes made towards a proper Vector update, as well as minor FAVS changes to accomodate for recent vector changes. 2019-01-13 01:38:08 -05:00
Josh KnightandGitHub b7bab7fe49 Merge pull request #12 from Combustible/new-vector-system
Merge master changes into IronApollo's WIP new-vector-system branch
2019-01-10 05:39:38 -05:00
IronApollo a9919d130c Current progress #4 2019-01-09 03:32:38 -05:00
IronApollo 842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
Josh KnightandGitHub 2b8afaf930 Merge pull request #10 from SirYwell/master
Temporary removal of tab complete listener
2019-01-03 05:18:13 -05:00
IronApollo d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
IronApollo 9896a1339e Updates to FaweLocalBlockQueue to allow FAWE-P2 compatibility 2018-11-01 07:24:56 -04:00
IronApollo dcd041e847 Potential fix for CommandSuggestionEvent errors 2018-11-01 07:22:50 -04:00
IronApollo 767607ea68 Fix for '//mask ?' resulting in pattern error 2018-10-29 06:39:40 -04:00
IronApollo 34c8ecc694 Fixed invoke method missing argument 2018-10-25 07:12:08 -04:00
IronApollo be73d29354 1.13.2 setType adaptation 2018-10-24 18:25:50 -04:00
IronApollo ea0133b740 Changes to completely separate SyncTabCompleteListener from Paper 2018-10-19 18:24:58 -04:00
IronApollo 3add6fd32b Check for the AsyncTabCompleteEvent class before attempting to create the Listener 2018-10-17 13:42:21 -04:00
IronApollo 17e8be0bd2 Fixes some schematic files not being found with proper input 2018-10-14 07:14:12 -04:00