update paper 1.20.6 by ColdeZhang · Pull Request #220 · PaperMC/Folia

ColdeZhang · 2024-05-08T03:27:51Z

Try to update for 1.20.6.

Known problems:

kyori:adventure versions doesnt match, and 4.17.0 is not available;
ChunkStatus.java class missing;
Some more typing error happened by migration;

MiniDigger · 2024-05-08T10:09:26Z

https://github.com/KyoriPowered/adventure/releases/tag/v4.17.0 was just released

Luuzzi · 2024-05-08T10:17:55Z

btw

remapper - net.fabricmc:tiny-remapper:0.10.1:fat -> net.fabricmc:tiny-remapper:0.10.2:fat
decompiler - net.minecraftforge:forgeflower:2.0.627.2 -> org.vineflower:vineflower:1.10.1

I think the changes are minor, but it still seems necessary

ColdeZhang · 2024-05-08T15:59:39Z

https://github.com/KyoriPowered/adventure/releases/tag/v4.17.0 was just released

I found it. But upstream paper using 4.17.0-snapshot in api, and 4.16.0 in server. I noticed in server build script have a commnet saying "Keep in sync with adventureVersion from Paper-API build file".

So I'm not sure if it should be modified in folia patch, I think maybe its belonging to paper's patch?

Leguan16 · 2024-05-08T16:12:35Z

Are you sure? It has been updated an hour ago or so.

ColdeZhang · 2024-05-08T17:08:58Z

btw

remapper - net.fabricmc:tiny-remapper:0.10.1:fat -> net.fabricmc:tiny-remapper:0.10.2:fat decompiler - net.minecraftforge:forgeflower:2.0.627.2 -> org.vineflower:vineflower:1.10.1

I think the changes are minor, but it still seems necessary

Yes, UR right. It vital for some class to be decompiled.

ColdeZhang · 2024-05-09T02:21:53Z

https://github.com/KyoriPowered/adventure/releases/tag/v4.17.0 was just released

I found it. But upstream paper using 4.17.0-snapshot in api, and 4.16.0 in server. I noticed in server build script have a commnet saying "Keep in sync with adventureVersion from Paper-API build file".

So I'm not sure if it should be modified in folia patch, I think maybe its belonging to paper's patch?

This has been fixed by Paper

(It was moved into net.minecraft.world.level.chunk.status)

…nging on upstream)

ColdeZhang · 2024-05-09T06:47:34Z

Migrations from folia's patch are done, there still a syntax err in net/minecraft/core/dispenser/ProjectileDispenseBehavior.java line 48 DispenserBlock.eventFired should use get() to fetch bollen type. I leave it alone, because it doesnt changed in folias patch, I think it's upstream's work.

Anyway, patches can be compiled allreday.

ColdeZhang · 2024-05-09T07:54:06Z

Greetings, maintainers. I'm done with 1.20.6 update. Could you review it please?

… hit block BlockPos

ColdeZhang · 2024-05-09T11:42:59Z

Fine, I got new problem.

Any commands send by client will cause "Internal Exception: java.lang.UnsupportedOperationException", and then kicked.
Commands send my console is ok.

This fault has no stacktrace, just "Internal Exception", I dont know how to debug it.

electronicboy · 2024-05-09T11:47:55Z

enable debug in server.properties or attach a profiler which can do exception recording

but, large PRs should generally be cleared by leaf first, not sure how much acceptance there is towards pulling in an update from somebody else

Luuzzi · 2024-05-09T11:52:40Z

enable debug in server.properties or attach a profiler which can do exception recording

but, large PRs should generally be cleared by leaf first, not sure how much acceptance there is towards pulling in an update from somebody else

Is he on vacation now? There is no information when we will be able to get a review of this PR or update to 1.20.6?

PedroMPagani · 2024-05-09T12:33:37Z

Fine, I got new problem.

Any commands send by client will cause "Internal Exception: java.lang.UnsupportedOperationException", and then kicked. Commands send my console is ok.

This fault has no stacktrace, just "Internal Exception", I dont know how to debug it.

You can attach exception catchers on the netty threads, that'll be usually it unless you're testing with plugins iirc you're not it seems, I'll get on development in your branch too, to help test out and get it ready.

…ava.lang.UnsupportedOperationException"

ColdeZhang · 2024-05-09T12:36:28Z

Fine, I got new problem.
Any commands send by client will cause "Internal Exception: java.lang.UnsupportedOperationException", and then kicked. Commands send my console is ok.
This fault has no stacktrace, just "Internal Exception", I dont know how to debug it.

You can attach exception catchers on the netty threads, that'll be usually it unless you're testing with plugins iirc you're not it seems, I'll get on development in your branch too, to help test out and get it ready.

enable debug in server.properties or attach a profiler which can do exception recording

but, large PRs should generally be cleared by leaf first, not sure how much acceptance there is towards pulling in an update from somebody else

Thanks for your guide, I have solved it. Look like works fine :)

PedroMPagani · 2024-05-09T12:42:30Z

Are you missing something on ProjectileDispenseBehavior? it doesn't build, it's missing .get()

ColdeZhang · 2024-05-09T12:44:31Z

Are you missing something on ProjectileDispenseBehavior? it doesn't build, it's missing .get()

Yes I leave it alone, because I thought that's upstream's work. It doesnt caused by folia patch, so I keep it out of folia's patch.

For now I change it manually each time before I build.

Do you guys think it should be in folia's patch? If so, I may add it.

PedroMPagani · 2024-05-09T12:46:32Z

Yes, that's a folia change, it should be changed, on paper that's a boolean, on folia for thread safety that's a thread local. IT should be on the patch

ColdeZhang · 2024-05-09T12:47:13Z

Yes, that's a folia change, it should be changed, on paper that's a boolean, on folia for thread safety that's a thread local. IT should be on the patch

Ok , got it. I may have a missing.

ColdeZhang · 2024-05-09T12:58:10Z

Things should be looks better now.

PedroMPagani · 2024-05-09T13:17:16Z

this all lgtm, seems to be working already tested the majority of the features, including experimental.

…er.level

Spottedleaf · 2024-05-10T16:41:45Z

 +            ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL,
 +            (chunks) -> {
 +                try {
 +        // Folia end - region threading
+
+         PlaceCommand.checkLoaded(worldserver, chunkcoordintpair, chunkcoordintpair);


load check should be before chunk load

Spottedleaf · 2024-05-10T16:43:20Z

     @Override
     public void handleChatCommand(ServerboundChatCommandPacket packet) {
-         if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) {
+         this.tryHandleChat(packet.command(), () -> {
+            this.player.getBukkitEntity().taskScheduler.schedule((ServerPlayer player) -> { // Folia - region threading


diff is not needed

Spottedleaf · 2024-05-10T16:44:00Z

@@ -15870,6 +15902,7 @@ index 1e5f709115007ff19901c0a6c3cf884d9e4d3a6c..08daa5ed0b4b599836b97eef1e53e630
 +        ServerLevel worldserver1 = ((CraftWorld)selectedSpawn.getWorld()).getHandle();
 +        player.setPosRaw(selectedSpawn.getX(), selectedSpawn.getY(), selectedSpawn.getZ());
 +        player.lastSave = System.nanoTime(); // changed to nanoTime
+        Optional<CompoundTag> optional = this.load(player); // CraftBukkit - decompile error // Folia - region threading - rewrite login process


should not be double-loading the data

Spottedleaf · 2024-05-10T16:44:36Z

-         long l = entity.level().getGameTime();
-
-        for(BehaviorControl<? super E> behaviorControl : this.getRunningBehaviors()) {
-+        for(BehaviorControl<? super E> behaviorControl : behaviors) {  // Folia - region threading


this diff is needed

Spottedleaf · 2024-05-10T16:46:00Z

-+
+     }
+
+-    private <T> ScheduledTick<T> createTick(BlockPos pos, T type, int delay) {


we shouldn't be changing the visibility unless required

Spottedleaf · 2024-05-10T16:47:09Z

-                 if (optional.isPresent() && optional.get() == world.dimension() && compoundTag.contains("LodestonePos")) {
-                     BlockPos blockPos = NbtUtils.readBlockPos(compoundTag.getCompound("LodestonePos"));
-                    if (!world.isInWorldBounds(blockPos) || (world.hasChunkAt(blockPos) && !((ServerLevel)world).getPoiManager().existsAtPosition(PoiTypes.LODESTONE, blockPos))) { // Paper - Prevent compass from loading chunks
-+                    // Folia start - do not access the POI data off-region


this patch is needed, as the logic was just moved elsewhere

Spottedleaf · 2024-05-10T16:55:00Z

In general we (Paper included) don't take external work for updates, since there's a lot of things involved that can go wrong

https://github.com/PaperMC/Folia/tree/dev/1.20.6

update paper 1.20.6

dda5c8d

ColdeZhang added 2 commits May 9, 2024 01:03

update build.gradle.kts with new mapper and decompiler

c990319

fix some threaded region modify for 1.20.6

d3c7fbd

fix wrong patch modify for BaseCommandBlock.java

95b4fbb

ColdeZhang added 12 commits May 9, 2024 10:25

update paper 5729b with adventure to 4.17.0

da304fd

fix chunkStatus missing

5f742e5

(It was moved into net.minecraft.world.level.chunk.status)

fix Paper - Perf: Optimize Hoppers

a88ac83

fix SummonCommand.java (params change)

09450a5

fix isEnchantmentCompatible (with params change)

f92544a

fix clearEffect (with removeEffect params change)

f45581e

fix StructureManager.java (with getStructureWithPieceAt)

92aa653

fix MapItem.java (caused by some var name changing on upstream)

ff570e5

fix ServerLoginPacketListenerImpl.java (caused by some var name cha…

9802d4d

…nging on upstream)

fix LevelTicks.java (caused by migration error)

a1d63d1

fix PlayerList.java - rewrite login process

21d0361

fix Raid.java with var change badOmenLevel -> raidOmenLevel

c99011e

ColdeZhang added 2 commits May 9, 2024 15:11

fix server stuck

ddaa90c

fix server crashed when preparing level

95b65d9

fix Rejecting UseItemOnPacket from player: Location too far away from…

9f512cf

… hit block BlockPos

fix client send commands cause kicked out with "Internal Exception: j…

d3a5b47

…ava.lang.UnsupportedOperationException"

fix "DispenserBlock.eventFired" missing get()

55edbef

Modify MinecraftServer.java to avoid evil import everything from serv…

e11a709

…er.level

Spottedleaf reviewed May 10, 2024

View reviewed changes

Comment thread patches/server/0003-Threaded-Regions.patch

Spottedleaf reviewed May 10, 2024

View reviewed changes

Spottedleaf closed this May 10, 2024

Euphillya mentioned this pull request Oct 13, 2024

Update Paper #296

Closed

Leguan16 mentioned this pull request Dec 15, 2025

UPDATE #410

Closed

Uh oh!

Conversation

ColdeZhang commented May 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MiniDigger commented May 8, 2024

Uh oh!

Luuzzi commented May 8, 2024

Uh oh!

ColdeZhang commented May 8, 2024

Uh oh!

Leguan16 commented May 8, 2024

Uh oh!

ColdeZhang commented May 8, 2024

Uh oh!

ColdeZhang commented May 9, 2024

Uh oh!

ColdeZhang commented May 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ColdeZhang commented May 9, 2024

Uh oh!

ColdeZhang commented May 9, 2024

Uh oh!

electronicboy commented May 9, 2024

Uh oh!

Luuzzi commented May 9, 2024

Uh oh!

PedroMPagani commented May 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ColdeZhang commented May 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PedroMPagani commented May 9, 2024

Uh oh!

ColdeZhang commented May 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PedroMPagani commented May 9, 2024

Uh oh!

ColdeZhang commented May 9, 2024

Uh oh!

ColdeZhang commented May 9, 2024

Uh oh!

PedroMPagani commented May 9, 2024

Uh oh!

Spottedleaf May 10, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Spottedleaf May 10, 2024

Choose a reason for hiding this comment

Uh oh!

Spottedleaf May 10, 2024

Choose a reason for hiding this comment

Uh oh!

Spottedleaf May 10, 2024

Choose a reason for hiding this comment

Uh oh!

Spottedleaf May 10, 2024

Choose a reason for hiding this comment

Uh oh!

Spottedleaf May 10, 2024

Choose a reason for hiding this comment

Uh oh!

Spottedleaf commented May 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ColdeZhang commented May 8, 2024 •

edited

Loading

ColdeZhang commented May 9, 2024 •

edited

Loading

PedroMPagani commented May 9, 2024 •

edited

Loading

ColdeZhang commented May 9, 2024 •

edited

Loading

ColdeZhang commented May 9, 2024 •

edited

Loading