2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-02-29 09:15:51 +08:00
|
|
|
From: Joseph Hirschfeld <joe@ibj.io>
|
2016-03-01 07:09:49 +08:00
|
|
|
Date: Thu, 3 Mar 2016 03:15:41 -0600
|
2016-02-29 09:15:51 +08:00
|
|
|
Subject: [PATCH] Add exception reporting event
|
|
|
|
|
|
|
|
|
2016-03-01 07:09:49 +08:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
|
|
|
|
new file mode 100644
|
2020-05-06 17:48:49 +08:00
|
|
|
index 0000000000000000000000000000000000000000..f699ce18ca044f813e194ef2786b7ea853ea86e7
|
2016-03-01 07:09:49 +08:00
|
|
|
--- /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;
|
|
|
|
+ }
|
|
|
|
+}
|
2021-03-16 15:19:45 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
|
2021-03-16 21:04:28 +08:00
|
|
|
index e9657faf0a24aee8444372e6f1ca0d971339ce5a..e8150c456efe72a561d6a6a7647eca05fbc8bd94 100644
|
2021-03-16 15:19:45 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
|
2021-03-16 21:04:28 +08:00
|
|
|
@@ -807,6 +807,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
2021-03-16 15:19:45 +08:00
|
|
|
return true;
|
|
|
|
} catch (Exception exception) {
|
|
|
|
PlayerChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
|
|
|
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
return false;
|
|
|
|
}
|
2016-02-29 09:15:51 +08:00
|
|
|
}
|
2021-03-16 15:19:45 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
|
|
|
|
index 107979178e8be5ee6cf885d42f992fabf3bd00b0..8a343a857dc4661ba256e39cf391dd2c7a1cc970 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -1,5 +1,6 @@
|
2021-03-16 15:19:45 +08:00
|
|
|
package net.minecraft.server.players;
|
2016-02-29 09:15:51 +08:00
|
|
|
|
2016-03-01 07:09:49 +08:00
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
2017-05-15 02:05:01 +08:00
|
|
|
import com.google.common.collect.Lists;
|
2018-07-15 09:53:17 +08:00
|
|
|
import com.google.common.collect.Maps;
|
|
|
|
import com.google.common.io.Files;
|
2021-03-16 15:19:45 +08:00
|
|
|
@@ -363,6 +364,7 @@ public class NameReferencingFileConverter {
|
2019-01-01 11:15:55 +08:00
|
|
|
root = NBTCompressedStreamTools.a(new java.io.FileInputStream(file5));
|
2016-02-29 09:15:51 +08:00
|
|
|
} catch (Exception exception) {
|
|
|
|
exception.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
if (root != null) {
|
2021-03-16 15:19:45 +08:00
|
|
|
@@ -376,6 +378,7 @@ public class NameReferencingFileConverter {
|
2016-02-29 09:15:51 +08:00
|
|
|
NBTCompressedStreamTools.a(root, new java.io.FileOutputStream(file2));
|
|
|
|
} catch (Exception exception) {
|
|
|
|
exception.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
}
|
2016-03-01 07:09:49 +08:00
|
|
|
}
|
2016-02-29 09:15:51 +08:00
|
|
|
// CraftBukkit end
|
2021-03-16 15:19:45 +08:00
|
|
|
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 928ca3189af1ddaba797628a087cd6c6a9016f5c..eaa97eb11d893266253fb108249ced1e0e96a4dc 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;
|
2016-03-01 07:09:49 +08:00
|
|
|
|
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
2021-03-16 15:19:45 +08:00
|
|
|
+
|
|
|
|
import java.util.Iterator;
|
|
|
|
import javax.annotation.Nullable;
|
|
|
|
import net.minecraft.core.BaseBlockPosition;
|
|
|
|
@@ -119,6 +121,7 @@ public class VillageSiege implements MobSpawner {
|
|
|
|
entityzombie.prepare(worldserver, worldserver.getDamageScaler(entityzombie.getChunkCoordinates()), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
|
|
|
|
} catch (Exception exception) {
|
|
|
|
VillageSiege.LOGGER.warn("Failed to create zombie for village siege at {}", vec3d, exception);
|
|
|
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
return;
|
|
|
|
}
|
2016-02-29 09:15:51 +08:00
|
|
|
|
2021-03-16 15:19:45 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
|
|
|
|
index 2d02b2fc502a0f7e541f7943ed647ff7177acee8..fd0595fd584046326eccacdf0a6afe40c5e84eed 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
|
|
|
|
@@ -301,6 +301,7 @@ public final class SpawnerCreature {
|
2020-06-25 19:00:35 +08:00
|
|
|
}
|
|
|
|
} catch (Exception exception) {
|
|
|
|
SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
|
2021-03-16 15:19:45 +08:00
|
|
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
|
2020-06-25 19:00:35 +08:00
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
2021-03-16 15:19:45 +08:00
|
|
|
@@ -407,6 +408,7 @@ public final class SpawnerCreature {
|
2020-08-25 10:22:08 +08:00
|
|
|
entity = biomesettingsmobs_c.c.a((World) worldaccess.getMinecraftWorld());
|
2016-02-29 09:15:51 +08:00
|
|
|
} catch (Exception exception) {
|
2019-04-26 09:24:00 +08:00
|
|
|
SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
|
2021-03-16 15:19:45 +08:00
|
|
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
|
2016-02-29 09:15:51 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2021-03-16 15:19:45 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
|
2021-03-16 21:04:28 +08:00
|
|
|
index 33469b719d679c65d4bcb8366008e6e107eb3a0b..01cb0c8dd9875986e0c08371e876f0dba3f0cf5a 100644
|
2021-03-16 15:19:45 +08:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/World.java
|
2020-06-25 19:00:35 +08:00
|
|
|
@@ -1,5 +1,10 @@
|
2021-03-16 15:19:45 +08:00
|
|
|
package net.minecraft.world.level;
|
2016-03-01 07:09:49 +08:00
|
|
|
|
2020-06-25 19:00:35 +08:00
|
|
|
+import co.aikar.timings.Timing;
|
|
|
|
+import co.aikar.timings.Timings;
|
2016-03-01 07:09:49 +08:00
|
|
|
+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
|
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
2019-04-26 09:24:00 +08:00
|
|
|
+import com.google.common.base.MoreObjects;
|
2018-07-15 09:53:17 +08:00
|
|
|
import com.google.common.collect.Lists;
|
2020-06-25 19:00:35 +08:00
|
|
|
import com.mojang.serialization.Codec;
|
2019-04-26 09:24:00 +08:00
|
|
|
import java.io.IOException;
|
2021-03-16 15:19:45 +08:00
|
|
|
@@ -737,8 +742,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
2019-04-26 09:24:00 +08:00
|
|
|
gameprofilerfiller.exit();
|
|
|
|
} catch (Throwable throwable) {
|
2016-03-01 07:09:49 +08:00
|
|
|
// Paper start - Prevent tile entity and entity crashes
|
2016-02-29 09:15:51 +08:00
|
|
|
- System.err.println("TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ());
|
2021-03-16 21:04:28 +08:00
|
|
|
+ String msg = "TileEntity threw exception at " + tileentity.getWorld().getWorld().getName() + ":" + tileentity.getPosition().getX() + "," + tileentity.getPosition().getY() + "," + tileentity.getPosition().getZ();
|
2016-02-29 09:15:51 +08:00
|
|
|
+ System.err.println(msg);
|
2019-04-26 09:24:00 +08:00
|
|
|
throwable.printStackTrace();
|
|
|
|
+ getServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
|
|
|
|
+ // Paper end
|
2016-02-29 09:15:51 +08:00
|
|
|
tilesThisCycle--;
|
2016-03-01 07:09:49 +08:00
|
|
|
this.tileEntityListTick.remove(tileTickPosition--);
|
2016-02-29 09:15:51 +08:00
|
|
|
continue;
|
2021-03-16 15:19:45 +08:00
|
|
|
@@ -808,8 +816,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
2019-04-26 09:24:00 +08:00
|
|
|
consumer.accept(entity);
|
|
|
|
} catch (Throwable throwable) {
|
|
|
|
// Paper start - Prevent tile entity and entity crashes
|
2019-12-11 10:43:21 +08:00
|
|
|
- System.err.println("Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ());
|
|
|
|
+ String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ();
|
2019-04-26 09:24:00 +08:00
|
|
|
+ System.err.println(msg);
|
|
|
|
throwable.printStackTrace();
|
|
|
|
+ getServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
|
|
|
|
entity.dead = true;
|
|
|
|
return;
|
|
|
|
// Paper end
|
2021-03-16 15:19:45 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
|
2021-03-16 23:50:45 +08:00
|
|
|
index a2d80c2c8e4f080f60746548f75631c5946ba8e2..4b3de29b1a6e9d75b28962073c62bbe8d666165f 100644
|
2021-03-16 15:19:45 +08:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.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;
|
2021-03-16 23:50:45 +08:00
|
|
|
@@ -655,10 +656,15 @@ public class Chunk implements IChunkAccess {
|
2021-03-16 15:19:45 +08:00
|
|
|
this.tileEntities.remove(blockposition);
|
|
|
|
// Paper end
|
|
|
|
} else {
|
|
|
|
- System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.getPosition().getX() + "," + tileentity.getPosition().getY() + "," + tileentity.getPosition().getZ()
|
|
|
|
- + " (" + getType(blockposition) + ") where there was no entity tile!");
|
|
|
|
- System.out.println("Chunk coordinates: " + (this.loc.x * 16) + "," + (this.loc.z * 16));
|
|
|
|
- new Exception().printStackTrace();
|
|
|
|
+ // Paper start
|
|
|
|
+ ServerInternalException e = new ServerInternalException(
|
2021-03-16 23:50:45 +08:00
|
|
|
+ "Attempted to place a tile entity (" + tileentity + ") at " + tileentity.getPosition().getX() + ","
|
|
|
|
+ + tileentity.getPosition().getY() + "," + tileentity.getPosition().getZ()
|
2021-03-16 15:19:45 +08:00
|
|
|
+ + " (" + getType(blockposition) + ") where there was no entity tile!\n" +
|
|
|
|
+ "Chunk coordinates: " + (this.loc.x * 16) + "," + (this.loc.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 f2694e46123ac2edcfdc53ef1abae283227eaa51..7f695f2b49df3400cd263fd6ffff77e753a65ea1 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
|
|
|
|
@@ -264,6 +264,7 @@ public class RegionFile implements AutoCloseable {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
} catch (IOException ioexception) {
|
|
|
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -336,6 +337,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/WorldPersistentData.java b/src/main/java/net/minecraft/world/level/storage/WorldPersistentData.java
|
|
|
|
index 3910daeaa177639fa8055301304634c2014dc20f..d61960d80599dc5e7b70cc990e4b0b174eb6e34e 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/level/storage/WorldPersistentData.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/storage/WorldPersistentData.java
|
|
|
|
@@ -150,6 +150,7 @@ public class WorldPersistentData {
|
2020-08-25 10:22:08 +08:00
|
|
|
}
|
|
|
|
} catch (Throwable throwable6) {
|
|
|
|
throwable = throwable6;
|
2019-04-26 09:24:00 +08:00
|
|
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
|
2020-08-25 10:22:08 +08:00
|
|
|
throw throwable6;
|
2018-08-27 02:11:49 +08:00
|
|
|
} finally {
|
2020-08-25 10:22:08 +08:00
|
|
|
if (fileinputstream != null) {
|
2016-02-29 09:15:51 +08:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
2020-12-10 04:09:54 +08:00
|
|
|
index ffe9cc1011226d604dc5499e7692e9a9a5132b72..9b6d9373abb59a30c2835ca891282d07559281f5 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
2019-04-26 09:24:00 +08:00
|
|
|
@@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
import java.util.function.Consumer;
|
2016-03-01 07:09:49 +08:00
|
|
|
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;
|
2020-06-28 17:34:23 +08:00
|
|
|
@@ -419,6 +422,8 @@ public class CraftScheduler implements BukkitScheduler {
|
|
|
|
msg,
|
2016-02-29 09:15:51 +08:00
|
|
|
throwable);
|
2020-06-28 17:34:23 +08:00
|
|
|
}
|
2020-12-10 04:09:54 +08:00
|
|
|
+ org.bukkit.Bukkit.getServer().getPluginManager().callEvent(
|
2020-06-28 17:34:23 +08:00
|
|
|
+ new ServerExceptionEvent(new ServerSchedulerException(msg, throwable, task)));
|
|
|
|
// Paper end
|
2018-06-21 11:29:33 +08:00
|
|
|
} finally {
|
|
|
|
currentTask = null;
|
2020-06-28 17:34:23 +08:00
|
|
|
@@ -426,7 +431,7 @@ public class CraftScheduler implements BukkitScheduler {
|
2016-02-29 09:15:51 +08:00
|
|
|
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)
|
|
|
|
}
|