Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-16 04:50:05 +01:00
Code Issues Projekte Releases Wiki Aktivität

Show full stack trace for errors during chunk caching/compression

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2014-01-30 06:58:37 +11:00
Ursprung a780739071
Commit 7bd5666ee2
1 geänderte Dateien mit 11 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

14
CraftBukkit-Patches/0105-Implement-Threaded-Bulk-Chunk-Compression-and-Cachin.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 8d913a3ada460ef4eb29dd7be5c09aa6d440d349 Mon Sep 17 00:00:00 2001 From 816113b6ab797579e991512bb391cf432670565e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 28 Jan 2014 20:32:07 +1100 Date: Tue, 28 Jan 2014 20:32:07 +1100
Subject: [PATCH] Implement Threaded Bulk Chunk Compression and Caching Subject: [PATCH] Implement Threaded Bulk Chunk Compression and Caching
@ -119,21 +119,23 @@ index fb95be4..2875c94 100644
ServerConnection.a(this.a).add(networkmanager); ServerConnection.a(this.a).add(networkmanager);
diff --git a/src/main/java/org/spigotmc/ChunkCompressor.java b/src/main/java/org/spigotmc/ChunkCompressor.java diff --git a/src/main/java/org/spigotmc/ChunkCompressor.java b/src/main/java/org/spigotmc/ChunkCompressor.java
new file mode 100644 new file mode 100644
index 0000000..90e03cb index 0000000..9992bca
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/ChunkCompressor.java +++ b/src/main/java/org/spigotmc/ChunkCompressor.java
@@ -0,0 +1,62 @@ @@ -0,0 +1,70 @@
+package org.spigotmc; +package org.spigotmc;
+ +
+import java.util.Arrays; +import java.util.Arrays;
+import java.util.Iterator; +import java.util.Iterator;
+import java.util.LinkedHashMap; +import java.util.LinkedHashMap;
+import java.util.logging.Level;
+import java.util.zip.CRC32; +import java.util.zip.CRC32;
+import net.minecraft.server.PacketPlayOutMapChunkBulk; +import net.minecraft.server.PacketPlayOutMapChunkBulk;
+import net.minecraft.util.io.netty.channel.ChannelHandler; +import net.minecraft.util.io.netty.channel.ChannelHandler;
+import net.minecraft.util.io.netty.channel.ChannelHandlerContext; +import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
+import net.minecraft.util.io.netty.channel.ChannelOutboundHandlerAdapter; +import net.minecraft.util.io.netty.channel.ChannelOutboundHandlerAdapter;
+import net.minecraft.util.io.netty.channel.ChannelPromise; +import net.minecraft.util.io.netty.channel.ChannelPromise;
+import org.bukkit.Bukkit;
+ +
+@ChannelHandler.Sharable +@ChannelHandler.Sharable
+public class ChunkCompressor extends ChannelOutboundHandlerAdapter +public class ChunkCompressor extends ChannelOutboundHandlerAdapter
@ -184,6 +186,12 @@ index 0000000..90e03cb
+ +
+ super.write( ctx, msg, promise ); + super.write( ctx, msg, promise );
+ } + }
+
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+ {
+ Bukkit.getServer().getLogger().log( Level.WARNING, "Error compressing or caching chunk", cause );
+ }
+} +}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 552266b..6c6e6b0 100755 index 552266b..6c6e6b0 100755