geforkt von Mirrors/Paper
265 Zeilen
15 KiB
Diff
265 Zeilen
15 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Joseph Hirschfeld <joe@ibj.io>
|
||
|
Date: Thu, 3 Mar 2016 03:15:41 -0600
|
||
|
Subject: [PATCH] Add exception reporting event
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
|
||
|
new file mode 100644
|
||
|
index 0000000000000000000000000000000000000000..f699ce18ca044f813e194ef2786b7ea853ea86e7
|
||
|
--- /dev/null
|
||
|
+++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
|
||
|
@@ -0,0 +1,38 @@
|
||
|
+package com.destroystokyo.paper;
|
||
|
+
|
||
|
+import com.google.common.base.Preconditions;
|
||
|
+import org.bukkit.craftbukkit.scheduler.CraftTask;
|
||
|
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
|
||
|
+import com.destroystokyo.paper.exception.ServerSchedulerException;
|
||
|
+
|
||
|
+/**
|
||
|
+ * Reporting wrapper to catch exceptions not natively
|
||
|
+ */
|
||
|
+public class ServerSchedulerReportingWrapper implements Runnable {
|
||
|
+
|
||
|
+ private final CraftTask internalTask;
|
||
|
+
|
||
|
+ public ServerSchedulerReportingWrapper(CraftTask internalTask) {
|
||
|
+ this.internalTask = Preconditions.checkNotNull(internalTask, "internalTask");
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void run() {
|
||
|
+ try {
|
||
|
+ internalTask.run();
|
||
|
+ } catch (RuntimeException e) {
|
||
|
+ internalTask.getOwner().getServer().getPluginManager().callEvent(
|
||
|
+ new ServerExceptionEvent(new ServerSchedulerException(e, internalTask))
|
||
|
+ );
|
||
|
+ throw e;
|
||
|
+ } catch (Throwable t) {
|
||
|
+ internalTask.getOwner().getServer().getPluginManager().callEvent(
|
||
|
+ new ServerExceptionEvent(new ServerSchedulerException(t, internalTask))
|
||
|
+ ); //Do not rethrow, since it is not permitted with Runnable#run
|
||
|
+ }
|
||
|
+ }
|
||
|
+
|
||
|
+ public CraftTask getInternalTask() {
|
||
|
+ return internalTask;
|
||
|
+ }
|
||
|
+}
|
||
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
index d1bc927c8b429f43de2cdad98f8b329ff4c8b4db..0597c0c3e881dd43cf91bd3088ed30dfecfe8098 100644
|
||
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
@@ -813,6 +813,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||
|
return true;
|
||
|
} catch (Exception exception) {
|
||
|
ChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
|
||
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
|
||
|
return false;
|
||
|
}
|
||
|
}
|
||
|
diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
||
|
index c167d2fd99a7a352e69e2930551678bd9c9def83..09c5fa2dbcbed05da51ef2d63e6d6112d22d7877 100644
|
||
|
--- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
||
|
+++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
||
|
@@ -1,5 +1,6 @@
|
||
|
package net.minecraft.server.players;
|
||
|
|
||
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
||
|
import com.google.common.collect.Lists;
|
||
|
import com.google.common.collect.Maps;
|
||
|
import com.google.common.io.Files;
|
||
|
@@ -360,6 +361,7 @@ public class OldUsersConverter {
|
||
|
root = NbtIo.readCompressed(new java.io.FileInputStream(file5));
|
||
|
} catch (Exception exception) {
|
||
|
exception.printStackTrace();
|
||
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
||
|
}
|
||
|
|
||
|
if (root != null) {
|
||
|
@@ -373,6 +375,7 @@ public class OldUsersConverter {
|
||
|
NbtIo.writeCompressed(root, new java.io.FileOutputStream(file2));
|
||
|
} catch (Exception exception) {
|
||
|
exception.printStackTrace();
|
||
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
||
|
}
|
||
|
}
|
||
|
// CraftBukkit end
|
||
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java b/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
|
||
|
index 78cea15142f9fd7988f5df397061b90625070eef..f50774f022c78813982bfe08f764b54bde779e04 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
|
||
|
@@ -1,5 +1,7 @@
|
||
|
package net.minecraft.world.entity.ai.village;
|
||
|
|
||
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
||
|
+
|
||
|
import java.util.Iterator;
|
||
|
import javax.annotation.Nullable;
|
||
|
import net.minecraft.core.BlockPos;
|
||
|
@@ -119,6 +121,7 @@ public class VillageSiege implements CustomSpawner {
|
||
|
entityzombie.finalizeSpawn(world, world.getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.EVENT, (SpawnGroupData) null, (CompoundTag) null);
|
||
|
} catch (Exception exception) {
|
||
|
VillageSiege.LOGGER.warn("Failed to create zombie for village siege at {}", vec3d, exception);
|
||
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
||
|
return;
|
||
|
}
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
index 7b4475807cca0e92ea9ae6ea49a82a8634cc0ff5..94e268a05b4601c29b6d2845f0fc2311643a161f 100644
|
||
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
@@ -1,5 +1,10 @@
|
||
|
package net.minecraft.world.level;
|
||
|
|
||
|
+import co.aikar.timings.Timing;
|
||
|
+import co.aikar.timings.Timings;
|
||
|
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
|
||
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
||
|
+import com.google.common.base.MoreObjects;
|
||
|
import com.google.common.collect.Lists;
|
||
|
import com.mojang.serialization.Codec;
|
||
|
import java.io.IOException;
|
||
|
@@ -737,8 +742,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||
|
gameprofilerfiller.pop();
|
||
|
} catch (Throwable throwable) {
|
||
|
// Paper start - Prevent tile entity and entity crashes
|
||
|
- System.err.println("TileEntity threw exception at " + tileentity.level.getWorld().getName() + ":" + tileentity.worldPosition.getX() + "," + tileentity.worldPosition.getY() + "," + tileentity.worldPosition.getZ());
|
||
|
+ String msg = "TileEntity threw exception at " + tileentity.getLevel().getWorld().getName() + ":" + tileentity.getBlockPos().getX() + "," + tileentity.getBlockPos().getY() + "," + tileentity.getBlockPos().getZ();
|
||
|
+ System.err.println(msg);
|
||
|
throwable.printStackTrace();
|
||
|
+ getCraftServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
|
||
|
+ // Paper end
|
||
|
tilesThisCycle--;
|
||
|
this.tickableBlockEntities.remove(tileTickPosition--);
|
||
|
continue;
|
||
|
@@ -808,8 +816,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||
|
tickConsumer.accept(entity);
|
||
|
} catch (Throwable throwable) {
|
||
|
// Paper start - Prevent tile entity and entity crashes
|
||
|
- System.err.println("Entity threw exception at " + entity.level.getWorld().getName() + ":" + entity.getX() + "," + entity.getY() + "," + entity.getZ());
|
||
|
+ String msg = "Entity threw exception at " + entity.level.getWorld().getName() + ":" + entity.getX() + "," + entity.getY() + "," + entity.getZ();
|
||
|
+ System.err.println(msg);
|
||
|
throwable.printStackTrace();
|
||
|
+ getCraftServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
|
||
|
entity.removed = true;
|
||
|
return;
|
||
|
// Paper end
|
||
|
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||
|
index fc134b916e95231af8478a4f97bf11a0f37f7f0b..a19ac1cb7e4d8d478648a048b2bfa0daf85a80c9 100644
|
||
|
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||
|
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||
|
@@ -299,6 +299,7 @@ public final class NaturalSpawner {
|
||
|
}
|
||
|
} catch (Exception exception) {
|
||
|
NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
|
||
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
|
||
|
return null;
|
||
|
}
|
||
|
}
|
||
|
@@ -405,6 +406,7 @@ public final class NaturalSpawner {
|
||
|
entity = biomesettingsmobs_c.type.create((Level) worldaccess.getLevel());
|
||
|
} catch (Exception exception) {
|
||
|
NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
|
||
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
|
||
|
continue;
|
||
|
}
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
||
|
index 300749822d52f9f973e71c6ec9c8bf29d6a6938e..9ca05aa06696883adc8b67a68ca6d2d850e95d25 100644
|
||
|
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
||
|
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
||
|
@@ -1,5 +1,6 @@
|
||
|
package net.minecraft.world.level.chunk;
|
||
|
|
||
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
||
|
import com.google.common.collect.Maps;
|
||
|
import com.google.common.collect.Sets;
|
||
|
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
|
||
|
@@ -654,10 +655,15 @@ public class LevelChunk implements ChunkAccess {
|
||
|
this.blockEntities.remove(pos);
|
||
|
// Paper end
|
||
|
} else {
|
||
|
- System.out.println("Attempted to place a tile entity (" + blockEntity + ") at " + blockEntity.getBlockPos().getX() + "," + blockEntity.getBlockPos().getY() + "," + blockEntity.getBlockPos().getZ()
|
||
|
- + " (" + getBlockState(pos) + ") where there was no entity tile!");
|
||
|
- System.out.println("Chunk coordinates: " + (this.chunkPos.x * 16) + "," + (this.chunkPos.z * 16));
|
||
|
- new Exception().printStackTrace();
|
||
|
+ // Paper start
|
||
|
+ ServerInternalException e = new ServerInternalException(
|
||
|
+ "Attempted to place a tile entity (" + blockEntity + ") at " + blockEntity.getBlockPos().getX() + ","
|
||
|
+ + blockEntity.getBlockPos().getY() + "," + blockEntity.getBlockPos().getZ()
|
||
|
+ + " (" + getBlockState(pos) + ") where there was no entity tile!\n" +
|
||
|
+ "Chunk coordinates: " + (this.chunkPos.x * 16) + "," + (this.chunkPos.z * 16));
|
||
|
+ e.printStackTrace();
|
||
|
+ ServerInternalException.reportInternalException(e);
|
||
|
+ // Paper end
|
||
|
// CraftBukkit end
|
||
|
}
|
||
|
}
|
||
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
|
||
|
index 60f410a4f838048bbfd2cde52caa7c4c9434b0ba..1598da3449ee1c559cf503e1b20a0daaf6a033dd 100644
|
||
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
|
||
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
|
||
|
@@ -265,6 +265,7 @@ public class RegionFile implements AutoCloseable {
|
||
|
return true;
|
||
|
}
|
||
|
} catch (IOException ioexception) {
|
||
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper
|
||
|
return false;
|
||
|
}
|
||
|
}
|
||
|
@@ -337,6 +338,7 @@ public class RegionFile implements AutoCloseable {
|
||
|
filechannel.write(bytebuffer);
|
||
|
} catch (Throwable throwable1) {
|
||
|
throwable = throwable1;
|
||
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
|
||
|
throw throwable1;
|
||
|
} finally {
|
||
|
if (filechannel != null) {
|
||
|
diff --git a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
|
||
|
index 60b7fdf9c092e8105d41f4af02a08651624f3eb9..99cfd693ea705d45a5eab181cb80c354a2d1159f 100644
|
||
|
--- a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
|
||
|
+++ b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
|
||
|
@@ -150,6 +150,7 @@ public class DimensionDataStorage {
|
||
|
}
|
||
|
} catch (Throwable throwable6) {
|
||
|
throwable = throwable6;
|
||
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
|
||
|
throw throwable6;
|
||
|
} finally {
|
||
|
if (fileinputstream != null) {
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||
|
index ffe9cc1011226d604dc5499e7692e9a9a5132b72..9b6d9373abb59a30c2835ca891282d07559281f5 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||
|
@@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||
|
import java.util.concurrent.atomic.AtomicReference;
|
||
|
import java.util.function.Consumer;
|
||
|
import java.util.logging.Level;
|
||
|
+import com.destroystokyo.paper.ServerSchedulerReportingWrapper;
|
||
|
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
|
||
|
+import com.destroystokyo.paper.exception.ServerSchedulerException;
|
||
|
import org.apache.commons.lang.Validate;
|
||
|
import org.bukkit.plugin.IllegalPluginAccessException;
|
||
|
import org.bukkit.plugin.Plugin;
|
||
|
@@ -419,6 +422,8 @@ public class CraftScheduler implements BukkitScheduler {
|
||
|
msg,
|
||
|
throwable);
|
||
|
}
|
||
|
+ org.bukkit.Bukkit.getServer().getPluginManager().callEvent(
|
||
|
+ new ServerExceptionEvent(new ServerSchedulerException(msg, throwable, task)));
|
||
|
// Paper end
|
||
|
} finally {
|
||
|
currentTask = null;
|
||
|
@@ -426,7 +431,7 @@ public class CraftScheduler implements BukkitScheduler {
|
||
|
parsePending();
|
||
|
} else {
|
||
|
debugTail = debugTail.setNext(new CraftAsyncDebugger(currentTick + RECENT_TICKS, task.getOwner(), task.getTaskClass()));
|
||
|
- executor.execute(task);
|
||
|
+ executor.execute(new ServerSchedulerReportingWrapper(task)); // Paper
|
||
|
// We don't need to parse pending
|
||
|
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
|
||
|
}
|