2018-09-29 07:31:59 +08:00
|
|
|
From 1974e5a1120239134abe1baa64fb13d61704831f 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
|
2018-09-01 06:56:57 +08:00
|
|
|
index 0000000000..93397188b7
|
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;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
\ No newline at end of file
|
2016-02-29 09:15:51 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
2018-09-29 07:31:59 +08:00
|
|
|
index 3123c80db9..968cf6ec65 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
2016-03-01 07:09:49 +08:00
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
|
|
|
import com.google.common.collect.Maps;
|
|
|
|
import com.google.common.collect.Queues;
|
2018-07-15 09:53:17 +08:00
|
|
|
import com.google.common.collect.Sets;
|
Improve Light Queue and force enable it for all
There is no reason for the light queue to even be an option. This
enables the light queue for everyone.
This also improves the "can we still tick" time logic to always
check before running a light operation.
previously, we always executed at least 10 on the first world
(but not other worlds...), but we are seeing light take up some
heavy time, so improving that for now.
I've now also improved recheck gaps logic to happen at the end of all single block updates
This also prevents multiple gap checks, as previously if a tick skipped
the gaps check, the next tick would end up re-adding the entry again,
resulting in multiple gap checks.
This now just sets a marker "We need to recheck gaps" and will only occur
once.
This also should reduce chunk loads, as previously, we checked if
the neighbor chunks were loaded for the gap check, however those
neighbor chunks might of unloaded before the light queue operation
actually ran. Now, the neighbor chunk is done when the gap check
is being done, so it should avoid loading chunks.
Fixes #1466
Fixes #1431
2018-09-22 23:46:31 +08:00
|
|
|
@@ -420,6 +421,7 @@ public class Chunk implements IChunkAccess {
|
2018-07-15 09:53:17 +08:00
|
|
|
return this.getBlockData(i, j, k).b(this.world, new BlockPosition(i, j, k));
|
|
|
|
}
|
2016-02-29 09:15:51 +08:00
|
|
|
|
2018-07-15 09:53:17 +08:00
|
|
|
+ public IBlockData getBlockData(BlockPosition blockposition) { return getType(blockposition); } // Paper
|
|
|
|
public IBlockData getType(BlockPosition blockposition) {
|
|
|
|
return this.getBlockData(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
}
|
2018-09-27 10:35:42 +08:00
|
|
|
@@ -815,10 +817,15 @@ public class Chunk implements IChunkAccess {
|
2016-02-29 09:15:51 +08:00
|
|
|
this.tileEntities.remove(blockposition);
|
2016-03-01 07:09:49 +08:00
|
|
|
// Paper end
|
2016-02-29 09:15:51 +08:00
|
|
|
} else {
|
|
|
|
- System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
|
2018-07-15 09:53:17 +08:00
|
|
|
- + " (" + getType(blockposition) + ") where there was no entity tile!");
|
2016-02-29 09:15:51 +08:00
|
|
|
- System.out.println("Chunk coordinates: " + (this.locX * 16) + "," + (this.locZ * 16));
|
|
|
|
- new Exception().printStackTrace();
|
|
|
|
+ // Paper start
|
|
|
|
+ ServerInternalException e = new ServerInternalException(
|
|
|
|
+ "Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + ","
|
2016-03-01 07:09:49 +08:00
|
|
|
+ + tileentity.position.getY() + "," + tileentity.position.getZ()
|
2018-08-27 02:11:49 +08:00
|
|
|
+ + " (" + getBlockData(blockposition) + ") where there was no entity tile!\n" +
|
2016-03-01 07:09:49 +08:00
|
|
|
+ "Chunk coordinates: " + (this.locX * 16) + "," + (this.locZ * 16));
|
2016-02-29 09:15:51 +08:00
|
|
|
+ e.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(e);
|
|
|
|
+ // Paper end
|
|
|
|
// CraftBukkit end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
2018-09-27 10:35:42 +08:00
|
|
|
index 0b03c6266a..d16fc452e3 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
2018-08-27 02:11:49 +08:00
|
|
|
@@ -15,6 +15,7 @@ import java.util.function.BooleanSupplier;
|
2018-07-15 09:53:17 +08:00
|
|
|
import java.util.function.Consumer;
|
|
|
|
import java.util.function.Function;
|
2016-05-12 10:07:46 +08:00
|
|
|
import javax.annotation.Nullable;
|
2016-03-01 07:09:49 +08:00
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
|
|
|
import org.apache.logging.log4j.LogManager;
|
|
|
|
import org.apache.logging.log4j.Logger;
|
2016-02-29 09:15:51 +08:00
|
|
|
|
2018-08-27 02:11:49 +08:00
|
|
|
@@ -209,9 +210,14 @@ public class ChunkProviderServer implements IChunkProvider {
|
2018-07-15 09:53:17 +08:00
|
|
|
ichunkaccess.setLastSaved(this.world.getTime());
|
|
|
|
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
|
2016-03-01 07:09:49 +08:00
|
|
|
} catch (IOException ioexception) {
|
|
|
|
- ChunkProviderServer.a.error("Couldn\'t save chunk", ioexception);
|
|
|
|
+ // Paper start
|
|
|
|
+ String msg = "Couldn\'t save chunk";
|
|
|
|
+ ChunkProviderServer.a.error(msg, ioexception);
|
|
|
|
+ ServerInternalException.reportInternalException(ioexception);
|
|
|
|
} catch (ExceptionWorldConflict exceptionworldconflict) {
|
|
|
|
- ChunkProviderServer.a.error("Couldn\'t save chunk; already in use by another instance of Minecraft?", exceptionworldconflict);
|
|
|
|
+ String msg = "Couldn\'t save chunk; already in use by another instance of Minecraft?";
|
|
|
|
+ ChunkProviderServer.a.error(msg, exceptionworldconflict);
|
|
|
|
+ ServerInternalException.reportInternalException(exceptionworldconflict);
|
2016-02-29 09:15:51 +08:00
|
|
|
}
|
2016-03-01 07:09:49 +08:00
|
|
|
|
|
|
|
}
|
2016-02-29 09:15:51 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index 1d830dff64..58d971cf20 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -1,5 +1,6 @@
|
2016-03-01 07:09:49 +08:00
|
|
|
package net.minecraft.server;
|
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;
|
|
|
|
@@ -356,6 +357,7 @@ public class NameReferencingFileConverter {
|
2016-02-29 09:15:51 +08:00
|
|
|
root = NBTCompressedStreamTools.a(new java.io.FileInputStream(file1));
|
|
|
|
} catch (Exception exception) {
|
|
|
|
exception.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
if (root != null) {
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -369,6 +371,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
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index f991fddf7d..e888c9bdba 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/RegionFile.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/RegionFile.java
|
2016-03-01 07:09:49 +08:00
|
|
|
@@ -1,5 +1,6 @@
|
2016-02-29 09:15:51 +08:00
|
|
|
package net.minecraft.server;
|
|
|
|
|
2016-03-01 07:09:49 +08:00
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
2016-02-29 09:15:51 +08:00
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
import java.io.BufferedInputStream;
|
2016-03-01 07:09:49 +08:00
|
|
|
import java.io.BufferedOutputStream;
|
2018-09-01 06:56:57 +08:00
|
|
|
@@ -75,6 +76,7 @@ public class RegionFile {
|
2016-02-29 09:15:51 +08:00
|
|
|
}
|
|
|
|
} catch (IOException ioexception) {
|
|
|
|
ioexception.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(ioexception); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2018-09-01 06:56:57 +08:00
|
|
|
@@ -221,6 +223,7 @@ public class RegionFile {
|
|
|
|
this.b(i, j, (int)(SystemUtils.d() / 1000L));
|
2016-02-29 09:15:51 +08:00
|
|
|
} catch (IOException ioexception) {
|
|
|
|
ioexception.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(ioexception); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index d18921271f..e5115863ec 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
2016-03-01 07:09:49 +08:00
|
|
|
@@ -1,5 +1,6 @@
|
2016-02-29 09:15:51 +08:00
|
|
|
package net.minecraft.server;
|
|
|
|
|
2016-03-01 07:09:49 +08:00
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
2016-02-29 09:15:51 +08:00
|
|
|
import com.google.common.collect.Maps;
|
|
|
|
import java.io.DataInputStream;
|
|
|
|
import java.io.DataOutputStream;
|
2018-08-27 02:11:49 +08:00
|
|
|
@@ -71,6 +72,7 @@ public class RegionFileCache {
|
2016-02-29 09:15:51 +08:00
|
|
|
}
|
|
|
|
} catch (IOException ioexception) {
|
|
|
|
ioexception.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(ioexception); // Paper
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
2018-09-16 00:10:26 +08:00
|
|
|
index 50b1175cc1..cc0a884cd3 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager;
|
|
|
|
import org.apache.logging.log4j.Logger;
|
2016-03-01 07:09:49 +08:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
2016-02-29 09:15:51 +08:00
|
|
|
import org.bukkit.craftbukkit.util.LongHash;
|
|
|
|
import org.bukkit.craftbukkit.util.LongHashSet;
|
|
|
|
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -167,6 +168,7 @@ public final class SpawnerCreature {
|
|
|
|
entityinsentient = (EntityInsentient) biomebase_biomemeta.b.a((World) worldserver);
|
|
|
|
} catch (Exception exception) {
|
|
|
|
SpawnerCreature.a.warn("Failed to create mob", exception);
|
|
|
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
return j1;
|
|
|
|
}
|
2016-02-29 09:15:51 +08:00
|
|
|
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -287,6 +289,7 @@ public final class SpawnerCreature {
|
|
|
|
entityinsentient = (EntityInsentient) biomebase_biomemeta.b.a(generatoraccess.getMinecraftWorld());
|
2016-02-29 09:15:51 +08:00
|
|
|
} catch (Exception exception) {
|
2018-07-15 09:53:17 +08:00
|
|
|
SpawnerCreature.a.warn("Failed to create mob", exception);
|
2016-02-29 09:15:51 +08:00
|
|
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index e649d662ae..560edb523f 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/VillageSiege.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/VillageSiege.java
|
|
|
|
@@ -1,5 +1,7 @@
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
2016-03-01 07:09:49 +08:00
|
|
|
+import com.destroystokyo.paper.exception.ServerInternalException;
|
2016-02-29 09:15:51 +08:00
|
|
|
+
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.List;
|
2016-05-12 10:07:46 +08:00
|
|
|
import javax.annotation.Nullable;
|
2016-11-17 10:23:38 +08:00
|
|
|
@@ -136,6 +138,7 @@ public class VillageSiege {
|
2018-07-15 09:53:17 +08:00
|
|
|
entityzombie.prepare(this.a.getDamageScaler(new BlockPosition(entityzombie)), (GroupDataEntity) null, (NBTTagCompound) null);
|
2016-02-29 09:15:51 +08:00
|
|
|
} catch (Exception exception) {
|
|
|
|
exception.printStackTrace();
|
|
|
|
+ ServerInternalException.reportInternalException(exception); // Paper
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
Improve Light Queue and force enable it for all
There is no reason for the light queue to even be an option. This
enables the light queue for everyone.
This also improves the "can we still tick" time logic to always
check before running a light operation.
previously, we always executed at least 10 on the first world
(but not other worlds...), but we are seeing light take up some
heavy time, so improving that for now.
I've now also improved recheck gaps logic to happen at the end of all single block updates
This also prevents multiple gap checks, as previously if a tick skipped
the gaps check, the next tick would end up re-adding the entry again,
resulting in multiple gap checks.
This now just sets a marker "We need to recheck gaps" and will only occur
once.
This also should reduce chunk loads, as previously, we checked if
the neighbor chunks were loaded for the gap check, however those
neighbor chunks might of unloaded before the light queue operation
actually ran. Now, the neighbor chunk is done when the gap check
is being done, so it should avoid loading chunks.
Fixes #1466
Fixes #1431
2018-09-22 23:46:31 +08:00
|
|
|
index 65e84b666f..19eb905979 100644
|
2016-02-29 09:15:51 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -1,6 +1,8 @@
|
2016-03-01 07:09:49 +08:00
|
|
|
package net.minecraft.server;
|
|
|
|
|
2018-07-15 09:53:17 +08:00
|
|
|
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;
|
2017-05-15 02:05:01 +08:00
|
|
|
import com.google.common.base.MoreObjects;
|
2018-07-15 09:53:17 +08:00
|
|
|
import com.google.common.collect.Lists;
|
2018-08-27 02:11:49 +08:00
|
|
|
import it.unimi.dsi.fastutil.longs.LongSet;
|
2018-09-16 00:10:26 +08:00
|
|
|
@@ -1200,8 +1202,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
2016-02-29 09:15:51 +08:00
|
|
|
} catch (Throwable throwable1) {
|
|
|
|
entity.tickTimer.stopTiming();
|
2016-03-25 12:59:37 +08:00
|
|
|
// Paper start - Prevent tile entity and entity crashes
|
2016-02-29 09:15:51 +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;
|
|
|
|
+ System.err.println(msg);
|
|
|
|
throwable1.printStackTrace();
|
|
|
|
+ getServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable1)));
|
|
|
|
entity.dead = true;
|
|
|
|
continue;
|
2016-03-01 07:09:49 +08:00
|
|
|
// Paper end
|
2018-09-16 00:10:26 +08:00
|
|
|
@@ -1266,8 +1270,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
2018-07-15 09:53:17 +08:00
|
|
|
this.methodProfiler.e();
|
2016-02-29 09:15:51 +08:00
|
|
|
} catch (Throwable throwable2) {
|
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());
|
|
|
|
+ String msg = "TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ();
|
|
|
|
+ System.err.println(msg);
|
|
|
|
throwable2.printStackTrace();
|
|
|
|
+ getServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable2)));
|
|
|
|
tilesThisCycle--;
|
2016-03-01 07:09:49 +08:00
|
|
|
this.tileEntityListTick.remove(tileTickPosition--);
|
2016-02-29 09:15:51 +08:00
|
|
|
continue;
|
2018-08-27 02:11:49 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index 65931bfb5f..625335c60f 100644
|
2018-08-27 02:11:49 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldPersistentData.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
|
|
|
|
@@ -138,6 +138,7 @@ public class WorldPersistentData {
|
|
|
|
|
|
|
|
nbttagcompound = GameProfileSerializer.a(idatamanager.i(), DataFixTypes.SAVED_DATA, nbttagcompound1, j, i);
|
|
|
|
} catch (Throwable throwable1) {
|
|
|
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable1); // Paper
|
|
|
|
throwable = throwable1;
|
|
|
|
throw throwable1;
|
|
|
|
} finally {
|
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
|
2018-09-01 06:56:57 +08:00
|
|
|
index 93b9134d6e..26753fac5e 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
|
2017-02-05 13:13:28 +08:00
|
|
|
@@ -15,6 +15,9 @@ import java.util.concurrent.atomic.AtomicReference;
|
2016-03-01 07:09:49 +08:00
|
|
|
import java.util.logging.Level;
|
2016-02-29 09:15:51 +08:00
|
|
|
|
2017-02-05 13:13:28 +08:00
|
|
|
import co.aikar.timings.MinecraftTimings; // Paper
|
2016-03-01 07:09:49 +08:00
|
|
|
+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;
|
2018-06-21 11:29:33 +08:00
|
|
|
@@ -360,20 +363,26 @@ public class CraftScheduler implements BukkitScheduler {
|
2016-02-29 09:15:51 +08:00
|
|
|
try {
|
|
|
|
task.run();
|
|
|
|
} catch (final Throwable throwable) {
|
|
|
|
+ // Paper start
|
|
|
|
+ String msg = String.format(
|
|
|
|
+ "Task #%s for %s generated an exception",
|
|
|
|
+ task.getTaskId(),
|
|
|
|
+ task.getOwner().getDescription().getFullName());
|
|
|
|
task.getOwner().getLogger().log(
|
|
|
|
Level.WARNING,
|
|
|
|
- String.format(
|
|
|
|
- "Task #%s for %s generated an exception",
|
|
|
|
- task.getTaskId(),
|
|
|
|
- task.getOwner().getDescription().getFullName()),
|
|
|
|
+ msg,
|
|
|
|
throwable);
|
|
|
|
+ task.getOwner().getServer().getPluginManager().callEvent(
|
|
|
|
+ new ServerExceptionEvent(new ServerSchedulerException(msg, throwable, task))
|
|
|
|
+ );
|
|
|
|
+ // Paper end
|
2018-06-21 11:29:33 +08:00
|
|
|
} finally {
|
|
|
|
currentTask = null;
|
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)
|
|
|
|
}
|
|
|
|
--
|
2018-09-16 00:10:26 +08:00
|
|
|
2.19.0
|
2016-02-29 09:15:51 +08:00
|
|
|
|