Skip to content

Master#1

Open
MinInjector wants to merge 63 commits into1.21.30from
master
Open

Master#1
MinInjector wants to merge 63 commits into1.21.30from
master

Conversation

@MinInjector
Copy link
Owner

No description provided.

dependabot bot and others added 30 commits December 14, 2022 20:58
---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
# Conflicts:
#	src/main/java/dev/waterdog/waterdogpe/network/protocol/ProtocolCodecs.java
# Conflicts:
#	pom.xml
#	src/main/java/dev/waterdog/waterdogpe/VersionInfo.java
java.lang.NullPointerException: Cannot invoke "org.cloudburstmc.protocol.bedrock.netty.codec.compression.CompressionStrategy.getDefaultCompression()" because "this.compressionStrategy" is null
        at dev.waterdog.waterdogpe.network.connection.peer.ProxiedBedrockPeer.sendPacket0(ProxiedBedrockPeer.java:122) ~[waterdog.jar:?]
        at dev.waterdog.waterdogpe.network.connection.peer.ProxiedBedrockPeer.lambda$sendPacket$0(ProxiedBedrockPeer.java:114) ~[waterdog.jar:?]
        at io.netty.util.concurrent.AbstractEventExecutor.runTask(AbstractEventExecutor.java:173) ~[waterdog.jar:?]
        at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:166) ~[waterdog.jar:?]
        at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:470) ~[waterdog.jar:?]
        at io.netty.channel.epoll.EpollEventLoop.run(EpollEventLoop.java:413) ~[waterdog.jar:?]
        at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:997) ~[waterdog.jar:?]
        at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) ~[waterdog.jar:?]
* Fix 1.21.60 protocol codec

* Use PacketSignal.UNHANDLED instead of calling super which does the same
# Conflicts:
#	src/main/java/dev/waterdog/waterdogpe/network/protocol/handler/downstream/AbstractDownstreamHandler.java
#	src/main/java/dev/waterdog/waterdogpe/player/ProxiedPlayer.java
irrld and others added 30 commits June 19, 2025 01:37
Allow negative entity ids and remove the server from pendingServers in all branches
Load camera preset definitions
# Conflicts:
#	src/main/java/dev/waterdog/waterdogpe/network/protocol/handler/downstream/AbstractDownstreamHandler.java
sync SyodogPE with WaterdogPE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants