spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2020-01-28 09:50:23 +11:00
parent bcd458ad9b
commit f2c1cd15d9
11 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From ee0db55184c78c3a14bcbbb679ae21110f46ca8c Mon Sep 17 00:00:00 2001
From 7a3170c153b2893e876e90f6bbda34f582a92b74 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -25,10 +25,10 @@ index 0dfe176b4..a4d84a4ff 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3b78900c1..ea2dea3b0 100644
index b38a9c5c7..15a70ebe8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2239,4 +2239,15 @@ public class CraftWorld implements World {
@@ -2234,4 +2234,15 @@ public class CraftWorld implements World {
PersistentRaid persistentRaid = world.getPersistentRaid();
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}

8
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From 061ef81c29b302868b609dcebb8cdb6732b94f30 Mon Sep 17 00:00:00 2001
From d0e80290617a44663ecfe080bb57b2dc78ec3c14 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -31,10 +31,10 @@ index dfaa54c0a..99e8d6310 100644
server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2a74becc9..5ee1ea293 100644
index 3e9af5b42..f63c9a4ef 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -82,6 +82,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -65,6 +65,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public long ticksPerAnimalSpawns;
public long ticksPerMonsterSpawns;
public boolean populating;
@ -42,7 +42,7 @@ index 2a74becc9..5ee1ea293 100644
public CraftWorld getWorld() {
return this.world;
@@ -96,6 +97,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -79,6 +80,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {

6
CraftBukkit-Patches/0005-Crop-Growth-Rates.patch
View file

@ -1,4 +1,4 @@
From 7959c5bd3d3609598b9a36f60ed1c669dc1c1e78 Mon Sep 17 00:00:00 2001
From 457c54a5c3c78afacf810b9fd1a0236241af4ed5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 7 Mar 2016 22:14:13 +1100
Subject: [PATCH] Crop Growth Rates
@ -146,10 +146,10 @@ index 0e3dc265b..2106b0b49 100644
worldserver.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockReed.AGE, 0), 4);
} else {
diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
index cc32f8e57..54c49e9ef 100644
index d1a7ca7d1..908e8dd33 100644
--- a/src/main/java/net/minecraft/server/BlockSapling.java
+++ b/src/main/java/net/minecraft/server/BlockSapling.java
@@ -32,7 +32,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -30,7 +30,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@Override
public void tick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, Random random) {
super.tick(iblockdata, worldserver, blockposition, random);

8
CraftBukkit-Patches/0007-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 4309dee56731c12ee0800ee3dff36eb4a30dbc9b Mon Sep 17 00:00:00 2001
From ceedc5b5e85b284a1405ce3398589c643ca3f0a2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -125,7 +125,7 @@ index 0eb3b16be..89ca00739 100644
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ea2dea3b0..dbb58ed87 100644
index 15a70ebe8..2f873eff6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -380,6 +380,7 @@ public class CraftWorld implements World {
@ -160,7 +160,7 @@ index ea2dea3b0..dbb58ed87 100644
IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
// If generate = false, but the chunk already exists, we will get this back.
@@ -1070,6 +1074,7 @@ public class CraftWorld implements World {
@@ -1065,6 +1069,7 @@ public class CraftWorld implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@ -168,7 +168,7 @@ index ea2dea3b0..dbb58ed87 100644
Validate.notNull(boundingBox, "Bounding box is null!");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -1224,6 +1229,7 @@ public class CraftWorld implements World {
@@ -1219,6 +1224,7 @@ public class CraftWorld implements World {
@Override
public void save() {

6
CraftBukkit-Patches/0008-View-Distance.patch
View file

@ -1,4 +1,4 @@
From fb66f4608d91772aae737949b11aeb81a4dc06fa Mon Sep 17 00:00:00 2001
From 62e91e82c5ca1d04a90343cf0b1eb308dea22f9a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -41,10 +41,10 @@ index 7adc3cf1d..4b8aaaf0d 100644
});
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index dbb58ed87..43cc7c750 100644
index 2f873eff6..0182dbfda 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2246,6 +2246,13 @@ public class CraftWorld implements World {
@@ -2241,6 +2241,13 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}

28
CraftBukkit-Patches/0009-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From c3bb98489f940ab5c1567d5c0ce92f6af3cadd7b Mon Sep 17 00:00:00 2001
From 20dacc524bd8eac2c5449f1be75efd3459ca4715 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -128,7 +128,7 @@ index 99e8d6310..305de2720 100644
@Override
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 02122ab1b..ab1665cbd 100644
index 0d66ff2c7..9ae74680c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -29,6 +29,7 @@ import org.bukkit.command.CommandSender;
@ -239,7 +239,7 @@ index 16938a198..6e9eed0bb 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index bf9c3a5f7..9a8b0a398 100644
index bdf18b7ce..f97e507e1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -63,6 +63,7 @@ import org.bukkit.craftbukkit.CraftServer;
@ -409,18 +409,18 @@ index 68e220bef..b7175ee6a 100644
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5ee1ea293..12572f621 100644
index f63c9a4ef..c250be53d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
@@ -18,6 +18,7 @@ import org.apache.logging.log4j.util.Supplier;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.block.BlockState;
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlockState;
@@ -84,6 +85,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
import org.bukkit.craftbukkit.block.CapturedBlockState;
@@ -67,6 +68,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public boolean populating;
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@ -429,7 +429,7 @@ index 5ee1ea293..12572f621 100644
public CraftWorld getWorld() {
return this.world;
}
@@ -140,6 +143,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -123,6 +126,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public void c(WorldBorder worldborder, double d0) {}
});
// CraftBukkit end
@ -437,7 +437,7 @@ index 5ee1ea293..12572f621 100644
}
@Override
@@ -585,6 +589,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -555,6 +559,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
GameProfilerFiller gameprofilerfiller = this.getMethodProfiler();
gameprofilerfiller.enter("blockEntities");
@ -445,7 +445,7 @@ index 5ee1ea293..12572f621 100644
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
this.tileEntityList.removeAll(this.tileEntityListUnload);
@@ -605,6 +610,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -575,6 +580,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
gameprofilerfiller.a(() -> {
return String.valueOf(TileEntityTypes.a(tileentity.getTileType()));
});
@ -453,7 +453,7 @@ index 5ee1ea293..12572f621 100644
if (tileentity.getTileType().isValidBlock(this.getType(blockposition).getBlock())) {
((ITickable) tileentity).tick();
} else {
@@ -619,6 +625,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -589,6 +595,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
tileentity.a(crashreportsystemdetails);
throw new ReportedException(crashreport);
}
@ -465,7 +465,7 @@ index 5ee1ea293..12572f621 100644
}
}
@@ -631,6 +642,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -601,6 +612,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}
@ -474,7 +474,7 @@ index 5ee1ea293..12572f621 100644
this.tickingTileEntities = false;
gameprofilerfiller.exitEnter("pendingBlockEntities");
if (!this.tileEntityListPending.isEmpty()) {
@@ -663,12 +676,15 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -633,12 +646,15 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.tileEntityListPending.clear();
}

6
CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch
View file

@ -1,14 +1,14 @@
From b0d5828996a0028bf9d8654be585d0b5d51c7630 Mon Sep 17 00:00:00 2001
From d36aed3c84df4b4c6d4ebe117707f417048fda4f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 12572f621..d112750bd 100644
index c250be53d..6c49377a9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -601,6 +601,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -571,6 +571,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();

6
CraftBukkit-Patches/0051-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 7e41cc0a34f382545e5564b6b45748b25b8737a8 Mon Sep 17 00:00:00 2001
From ee965184a5e0cf1f66038e31f92e24e8cdaa4688 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -41,10 +41,10 @@ index c074d7a40..7c518983a 100644
// this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 43cc7c750..2c0a426a5 100644
index 0182dbfda..6beee8196 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2256,6 +2256,22 @@ public class CraftWorld implements World {
@@ -2251,6 +2251,22 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

10
CraftBukkit-Patches/0065-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
View file

@ -1,14 +1,14 @@
From 1dbd05293adc2a599260b469cafb3138244d8cad Mon Sep 17 00:00:00 2001
From 0e591b0758a05291bbff7bf3ffcce6dc0c2e3994 Mon Sep 17 00:00:00 2001
From: David <dmck2b@gmail.com>
Date: Mon, 21 Apr 2014 12:43:08 +0100
Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d112750bd..f6f21e122 100644
index 6c49377a9..4613d8b67 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -86,6 +86,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -69,6 +69,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
public final SpigotTimings.WorldTimingsHandler timings; // Spigot
@ -16,7 +16,7 @@ index d112750bd..f6f21e122 100644
public CraftWorld getWorld() {
return this.world;
@@ -286,7 +287,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -259,7 +260,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
// CraftBukkit start
if (!this.captureBlockStates) { // Don't notify clients or update physics while capturing blockstates
// Modularize client and physic updates
@ -31,7 +31,7 @@ index d112750bd..f6f21e122 100644
}
// CraftBukkit end
@@ -443,6 +450,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -416,6 +423,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
// CraftBukkit end
iblockdata.doPhysics(this, blockposition, block, blockposition1, false);

6
CraftBukkit-Patches/0087-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From 2dfd772c323100f1020e2dfefaf735a3d064d72e Mon Sep 17 00:00:00 2001
From 7b4a60e547b9fb5159c8bc110d836c79e397c8be Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
@ -19,10 +19,10 @@ index ec238b051..d04212436 100644
this.setMot(this.getMot().add(0.0D, -0.04D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f6f21e122..60e9e11b1 100644
index 4613d8b67..ce3af4471 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -696,6 +696,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -666,6 +666,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
timings.tileEntityPending.stopTiming(); // Spigot
gameprofilerfiller.exit();

12
CraftBukkit-Patches/0090-Allow-Capping-Tile-Entity-Tick-Time.patch
View file

@ -1,4 +1,4 @@
From e17b3b4e600a644829a88cd63ad6dbadc6289ae0 Mon Sep 17 00:00:00 2001
From 7f617012718c9c7f88cd2f3bbfd201915161f596 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Feb 2015 21:39:31 +1100
Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
@ -10,10 +10,10 @@ For tiles there is very little tradeoff for this option, as tile ticks are based
This feature was commisioned by Chunkr.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 60e9e11b1..a1ee67b30 100644
index ce3af4471..cdd254a7e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -87,6 +87,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -70,6 +70,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final SpigotTimings.WorldTimingsHandler timings; // Spigot
public static BlockPosition lastPhysicsProblem; // Spigot
@ -23,7 +23,7 @@ index 60e9e11b1..a1ee67b30 100644
public CraftWorld getWorld() {
return this.world;
@@ -145,6 +148,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -128,6 +131,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
});
// CraftBukkit end
timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
@ -32,7 +32,7 @@ index 60e9e11b1..a1ee67b30 100644
}
@Override
@@ -608,14 +613,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -578,14 +583,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
this.tickingTileEntities = true;
@ -57,7 +57,7 @@ index 60e9e11b1..a1ee67b30 100644
continue;
}
// Spigot end
@@ -652,7 +662,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -622,7 +632,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
if (tileentity.isRemoved()) {