aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff options
context:
space:
mode:
authorEsoteric Enderman <[email protected]>2024-09-28 20:32:56 +0100
committerGitHub <[email protected]>2024-09-28 21:32:56 +0200
commit355b1cbaf6f0d6331476cb6e45291da647493dd1 (patch)
tree7c9976e61893fac5d41106a31513f6653ccf1947 /patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
parent7b031414984efcfe74e9aeb9db10a78e7af63b1a (diff)
downloadPaper-355b1cbaf6f0d6331476cb6e45291da647493dd1.tar.gz
Paper-355b1cbaf6f0d6331476cb6e45291da647493dd1.zip
Add API for explosions to damage the explosion cause (#11180)
This intends to give plugin developers more control over explosions created using the World#createExplosion method, specifically by adding the option for explosions to damage the explosion cause (not the default behavior, and previously impossible to do, as far as I know). This is done by overloading existing methods with an extra `excludeSourceFromDamage` parameter. Co-authored-by: Bjarne Koll <[email protected]>
Diffstat (limited to 'patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch')
-rw-r--r--patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 2ab532b2d0..e7c3500d18 100644
--- a/patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -25,10 +25,10 @@ index ee54706b36bd227edacea2a1b6099009bd652039..8206ec366b429858d9582e437781191e
EntityType<?> entitytypes = entity.getType();
int i = entitytypes.clientTrackingRange() * 16;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f1fa4cb11f69e248dd55b8aa69f5d07268f182a1..89e05d9316b012a5c8103682ff9dbeae757f4f57 100644
+index b465f05d78e79ffbf70114b18204d85d32761c67..5b89d834a7c01530807e61ea25af2b01f004ce86 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2149,7 +2149,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2151,7 +2151,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void onTrackingStart(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -37,7 +37,7 @@ index f1fa4cb11f69e248dd55b8aa69f5d07268f182a1..89e05d9316b012a5c8103682ff9dbeae
if (entity instanceof ServerPlayer entityplayer) {
ServerLevel.this.players.add(entityplayer);
ServerLevel.this.updateSleepingPlayerList();
-@@ -2179,6 +2179,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2181,6 +2181,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
entity.inWorld = true; // CraftBukkit - Mark entity as in world
entity.valid = true; // CraftBukkit