Commit Graph

379 Commits

Author SHA1 Message Date
ae23794b43 fix //cut -e 2020-07-29 22:43:52 +02:00
b411ea9af4 Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-26 19:03:46 +02:00
72269e08e6 Force sync teleports with trySetPosition
Fixes #542
2020-07-24 20:29:08 +01:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
2a493ac9c6 Update trySetPosition 2020-07-13 13:09:03 -04:00
4c299bc0b8 Replace setPosition with trySetPosition (#1403)
Allows cancellation information to be fed back into the ascend/descend
algorithms.

(cherry picked from commit 71e104bcb187a5313e88dda5df79059c8ffbc1fe)
2020-07-10 13:22:48 -04:00
bc45a112ee Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities 2020-07-03 19:54:08 +02:00
94b1233d98 implement entities in paste -e 2020-07-03 19:52:55 +02:00
63bc151f6c Hopefully allow for unloaded world to be referenced after GC.
Possibly fixes #504
2020-07-03 13:27:26 +01:00
34298f7dee Add back the getEntity Stuff since it seems to work fine 2020-07-01 19:28:38 +02: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
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
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
b7debce4d4 1.16.1 Prep work 2020-06-25 20:29:09 -04:00
aac02ceea1 start reimplementing entities 2020-06-25 22:13:34 +02: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
7cc1994e20 Use StandardCharsets 2020-06-12 21:45:49 -04:00
33adba4a6f Use a long to refer to the volume of a region to prevent overflow (#1350)
* Use a long to refer to the volume of a region, and rename the method to getVolume

* Fixed issues noted in review

* Forgot to floor

* Fixed review notes

* Can use a long here rather than BigDecimal

* Improve javadocs

* style

(cherry picked from commit 328030fd6281e58a4ea1d0cdd0a2e274da90afbe)
2020-06-12 21:45:49 -04:00
3265a9e794 Remove unused regenerate method 2020-04-28 11:16:51 -04:00
318e367cf0 Correctly unregister player on quit and close clipboard if using disk. 2020-03-30 17:41:41 +01:00
342da647d7 Fixing that the PlayerDropItemEvent was not fired 2020-03-29 11:53:31 +02:00
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
e648b35b95 Small code quality changes 2020-03-24 12:32:36 -04:00
8f2c3df61b Merge pull request #359 from tsao-chi-fork/patch-1
use JavaPlugin.getResource() instead of JarFile.getEntry()
2020-03-21 17:32:14 -04:00
45ac55185f Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-20 21:19:37 -04:00
a22bcb1c2a Fix tab completion 2020-03-19 17:23:11 -05:00
9f07894f28 Performance improvement based on case study by @me4502 2020-03-19 13:08:25 -04:00
dcee873b57 fix typo 2020-03-11 13:35:37 +08:00
39e1026400 use try-with-resources 2020-03-11 13:34:11 +08:00
bd692917e6 remove unnecessary import 2020-03-10 12:36:16 +08:00
fbb1078569 use JavaPlugin.getResource() instead of JarFile.getEntry() 2020-03-09 13:14:16 +08:00
915ab43f6e Cleanup unused code. 2020-03-05 16:07:20 -05:00
c9aebf17d8 Fix #320 ; optimize adapter imports 2020-02-20 21:28:28 -05:00
0047f20d5d Minor code quality changes
Changed Lock to subclass ReentrantLock since that is the only subclass DelegateLock should be using. The lock should also never be null so I added an annotation in the constructor.
I also removed some code and replaced it with PaperLib code to just clean up things a little bit.
2020-02-07 14:33:51 -05:00
5feac07bf0 Revert "Fixed commands not working"
This reverts commit 0b5eb903
2020-02-06 20:33:19 -05:00
f9e7b7300e Minor changes 2020-02-05 16:27:50 -05:00
3452fd5a63 Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15 2020-02-04 17:59:08 -05:00
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
6c5ac08a3c Minor upstream changes 2020-01-31 17:44:50 -05:00
7236b0a026 Minor code changes 2020-01-29 17:10:59 -05:00
d381617f11 Revert "Using an array instead of an EnumMap isn't necessary here"
This reverts commit 240a817e
2020-01-29 16:03:02 -05:00
020c674c01 Revert migration of FaweCache to Kotlin 2020-01-29 15:01:38 -05:00