mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
3dd9f46453
Upstream has released updates that appear to apply and compile correctly Paper Changes: 8c74d3126 Updated Upstream (Bukkit) (#5359) fd3c66a91 bug #5362 - correctly pass "render type" when registering a new scoreboard objective 39c487b37 Add per-command perms for paper command cdbf2578c Add Item Rarity API (#5352) d80e43647 [CI-SKIP] Removal from the MIT list (#5345) Tuinity Changes: aea6b8347 Merge dev/playerchunkloading 722c7ca8a Use hash table for maintaing changed block set 98ae59d85 Custom table implementation for blockstate state lookups 8b8704fb6 Oprimise map impl for tracked players ea71d6ba4 Optimise snow & ice in chunk ticking 9871d4ce5 Remove chunk lookup & lambda allocation from counting mobs 5a4a35f3e Add patreon 7d93d9618 Refactor data management for region manager c3035219f Change license from MIT to LGPLv3 Airplane Changes: 580f380b6 Updated Upstream (Tuinity) 82253fd36 Early return optimization for target finding 9572643bb Cache entityhuman display name 5df98254f Remove iterators from inventory contains 18d2be193 Merge pull request #14 from violetwtf/patch-1 f716d4c33 Merge pull request #13 from violetwtf/master 128cbe519 Reduce entity chunk ticking checks from 3 to 1 03ac0933b Skip copying unloading tile entities 97dd027b5 Smaller pool size for tracking 9e9f57be4 Only set up Flare if token is available
66 lines
3.8 KiB
Diff
66 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Phoenix616 <max@themoep.de>
|
|
Date: Mon, 19 Oct 2020 17:20:53 +0100
|
|
Subject: [PATCH] Origami - Fix ProtocolLib issues on Java 15
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
|
|
index d93634391501da01cb1afe70fedd5247c654e8fc..53b5063b43e42f09c2ef335251c91d2051676972 100644
|
|
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
|
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
|
@@ -416,9 +416,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
|
// note: since the type is not dynamic here, we need to actually copy the old executor code
|
|
// into two branches. On conflict, just re-copy - no changes were made inside the executor code.
|
|
if (flush) {
|
|
- choice1 = () -> {
|
|
+ choice1 = new Runnable() { public void run() { // Origami - flatten lambda
|
|
if (enumprotocol != enumprotocol1) {
|
|
- this.setProtocol(enumprotocol);
|
|
+ NetworkManager.this.setProtocol(enumprotocol); // Origami - flatten lambda
|
|
}
|
|
|
|
// Paper start
|
|
@@ -428,7 +428,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
|
}
|
|
try {
|
|
// Paper end
|
|
- ChannelFuture channelfuture1 = (flush) ? this.channel.writeAndFlush(packet) : this.channel.write(packet); // Tuinity - add flush parameter
|
|
+ ChannelFuture channelfuture1 = (flush) ? NetworkManager.this.channel.writeAndFlush(packet) : NetworkManager.this.channel.write(packet); // Tuinity - add flush parameter // Origami - flatten lambda
|
|
|
|
|
|
if (genericfuturelistener != null) {
|
|
@@ -448,12 +448,12 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
|
packet.onPacketDispatchFinish(player, null);
|
|
}
|
|
// Paper end
|
|
- };
|
|
+ }}; // Origami - flatten lambda
|
|
} else {
|
|
// explicitly declare a variable to make the lambda use the type
|
|
- choice2 = () -> {
|
|
+ choice2 = new AbstractEventExecutor.LazyRunnable() { public void run() { // Origami - flatten lambda
|
|
if (enumprotocol != enumprotocol1) {
|
|
- this.setProtocol(enumprotocol);
|
|
+ NetworkManager.this.setProtocol(enumprotocol); // Origami - flatten lambda
|
|
}
|
|
|
|
// Paper start
|
|
@@ -463,7 +463,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
|
}
|
|
try {
|
|
// Paper end
|
|
- ChannelFuture channelfuture1 = (flush) ? this.channel.writeAndFlush(packet) : this.channel.write(packet); // Tuinity - add flush parameter
|
|
+ ChannelFuture channelfuture1 = (flush) ? NetworkManager.this.channel.writeAndFlush(packet) : NetworkManager.this.channel.write(packet); // Tuinity - add flush parameter // Origami - flatten lambda
|
|
|
|
|
|
if (genericfuturelistener != null) {
|
|
@@ -483,7 +483,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
|
packet.onPacketDispatchFinish(player, null);
|
|
}
|
|
// Paper end
|
|
- };
|
|
+ }}; // Origami - flatten lambda
|
|
}
|
|
this.channel.eventLoop().execute(choice1 != null ? choice1 : choice2);
|
|
// Tuinity end - optimise packets that are not flushed
|