Commit Graph

6309 Commits

Author SHA1 Message Date
77204df3f0 prevent players being teleported down a single block after some edits 2020-07-03 16:56:20 +01:00
e2ab87cc07 lazy //deform AIOOB fix.
Fixes #495
2020-07-03 16:45:28 +01:00
f7d375c76c Lazy heightmap range fix 2020-07-03 16:29:27 +01:00
9e25c736a0 Add new blocks to BlockTypes 2020-07-03 14:12:43 +01:00
2812841481 Add -p flag to //drain to allow kelp and watergrass to be removed.
properly fixed #464
2020-07-03 14:01:16 +01:00
ea7897934f Implement ability to use -w flag on //drain
fixes #464
2020-07-03 13:49:17 +01:00
63bc151f6c Hopefully allow for unloaded world to be referenced after GC.
Possibly fixes #504
2020-07-03 13:27:26 +01:00
fae528ab64 add a couple more changes++
Fixes #508
2020-07-03 13:18:09 +01:00
f1d4104480 Bunch of changes to help masks 2020-07-02 22:09:12 +01:00
18c9da372c GetBlocks should default to air not reserved 2020-07-02 18:16:15 +01:00
b58877a57b Use BlockType not BlockState 2020-07-02 14:51:09 +01:00
d3afc9c65d Update to p2 5.12.2 and implement clear pipeline 2020-07-02 14:34:05 +01:00
6f71aa7804 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-01 20:07:17 -04:00
ac314fcedb Gradle update 2020-07-01 20:06:59 -04:00
ce406e404b We shouldn't be setting REGENERATIVE_CLEAR to false 2020-07-01 19:46:43 +01:00
34298f7dee Add back the getEntity Stuff since it seems to work fine 2020-07-01 19:28:38 +02:00
8b3479d477 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-01 19:09:05 +02:00
0fb564be0c Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16
 Conflicts:
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
2020-07-01 12:48:12 -04:00
3e40f82d9a fix error on loading for some versions 2020-07-01 15:05:38 +01:00
9fc2387f11 Revert "start reimplementing entities"
This reverts commit aac02ceea1.
2020-07-01 14:54:11 +02:00
6fc68da2ce Revert "got paste -e working, still throws IllegalStateException but idc"
This reverts commit 54008be1a2.
2020-07-01 14:52:50 +02:00
b96d45e4e6 merge 1.16 2020-07-01 14:46:25 +02:00
fdbef4e12c Update DummyFawe.src 2020-07-01 14:22:04 +02:00
efc1a888d8 update links, versions, etc 2020-07-01 13:17:19 +01:00
0bb6bc3563 Start reimplementation of simplex pattern (#520)
* Start reimplementation of simplex pattern

* Fix suggestions

* Allow nested weighted patterns

* Add documentation and improve error handling

* Remove unnecessary code and obsolete TODOs
2020-07-01 13:01:39 +01:00
6be429cc96 Lighting:
- bring fixes to 1.16
- Fix for all lighting where it only set sky lighting if not present, even if it was trying to set block lighting (unlikely to have caused issues as block lighting seems always to be present, but wrong nonetheless)
2020-07-01 12:55:58 +01:00
3b19738ea0 Merge branch '1.15' into 1.16
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
2020-07-01 12:47:04 +01:00
3f3c49c0a8 Looks like working block setting and removal 2020-07-01 12:41:20 +01:00
4ca19acb48 implement 1.16 methods 2020-06-30 13:51:27 +01:00
f84958957c Fix various lighting issues
fixes #496
possibly fixes #497
2020-06-30 13:44:26 +01:00
d232dc28e3 Cherry-pick WNA, minor changes. 1.16 VERY WIP
First noticed incident of operations ruining ChunkSections. Do not build and use this unless you're testing.

Rushed some of the changes, gotta sleep. Would be nice to get a review of this one from @mattbdev and @dordsor21
2020-06-29 22:08:16 -04:00
4604aa5920 Additional work towards 1.16 compatibility
- Very basic implementation of the SideEffects system. Will definitely need fine tuning for it to be functional, but is not considered a priority in my opinion.
- Minor changes to the World interface and World implementations related to the SideEffects system. Shouldn't be the cause of any new bugs but be on the lookout.
- Included debug in BukkitImplLoader.java to assist contributors in understanding what needs to be implemented for the adapter to load properly.

Still very WIP but we're a few steps closer. So far, this is coming along better than I anticipated. Hopefully we can keep the momentum.
2020-06-29 22:08:16 -04:00
68679e007e Work towards 1.16 compatibility
This commit will allow the branch to build properly but the plugin will not function properly due to the lack of a proper adapter implementation. Proceeding will require the implementation of the SideEffects system from upstream (865c3a24d2 (diff-8fd33296e427c87d0296ad7f3ccc050a)).
2020-06-29 22:08:16 -04:00
b59b95c282 Cherry-pick WNA, minor changes. 1.16 VERY WIP
First noticed incident of operations ruining ChunkSections. Do not build and use this unless you're testing.

Rushed some of the changes, gotta sleep. Would be nice to get a review of this one from @mattbdev and @dordsor21
2020-06-29 22:05:41 -04:00
2517aca66f Removed some unnecessary code. 2020-06-28 17:31:13 -04:00
82adab77b4 Additional work towards 1.16 compatibility
- Very basic implementation of the SideEffects system. Will definitely need fine tuning for it to be functional, but is not considered a priority in my opinion.
- Minor changes to the World interface and World implementations related to the SideEffects system. Shouldn't be the cause of any new bugs but be on the lookout.
- Included debug in BukkitImplLoader.java to assist contributors in understanding what needs to be implemented for the adapter to load properly.

Still very WIP but we're a few steps closer. So far, this is coming along better than I anticipated. Hopefully we can keep the momentum.
2020-06-26 22:14:19 -04:00
f2bc8d86fc Work towards 1.16 compatibility
This commit will allow the branch to build properly but the plugin will not function properly due to the lack of a proper adapter implementation. Proceeding will require the implementation of the SideEffects system from upstream (865c3a24d2 (diff-8fd33296e427c87d0296ad7f3ccc050a)).
2020-06-26 19:08:45 -04:00
54008be1a2 got paste -e working, still throws IllegalStateException but idc 2020-06-26 13:52:18 +02:00
aab10adb79 Fixed all but one remaining API changes in 1.16.1
No testing has been performed yet.
2020-06-25 20:57:06 -04:00
9cb24bc37d Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitAdapter_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/MapChunkUtil_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/nbt/LazyCompoundTag_1_16_1.java
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java
2020-06-25 20:29:42 -04:00
b7debce4d4 1.16.1 Prep work 2020-06-25 20:29:09 -04:00
7d9dd3b15f 1.16.1 Prep work 2020-06-25 19:56:10 -04:00
aac02ceea1 start reimplementing entities 2020-06-25 22:13:34 +02:00
6d056847c1 Update adapter jar.
(cherry picked from commit 9e186225bd25f4805d09081f8b8ca717f61a73a4)
2020-06-25 15:41:49 -04:00
3d40336045 Fixes #500, Fixes #513 2020-06-19 09:12:58 +02:00
ef704e23ad Add a few disallowed blocks as example...
since people fail to use the proper syntax
2020-06-18 10:51:53 +02:00
437d5a2a43 Minor image brush changes 2020-06-17 22:34:55 -04:00
33c3cb2f33 Revert portion of "Minor cleanup" to fix history bugs 2020-06-13 14:54:07 -04:00
238c56a3c6 Revert "Revert matt's changes"
This reverts commit bfcc6184ad.
2020-06-13 14:41:36 -04:00
bfcc6184ad Revert matt's changes
Let's not break Fawe, thanks
2020-06-13 18:48:57 +02:00