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 2021-07-13 19:18:55 +10:00
parent eac3cd9639
commit 38e6c03da1
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
7 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 3911c1f09d87f7836942580239c3de01a3195051 Mon Sep 17 00:00:00 2001
From 34a4c9b8b8b6bad4049702ebd8e500d3f760046c 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
@ -27,10 +27,10 @@ index 73bb34b63..6e115dac9 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index dfaffdc67..bcb0f18b3 100644
index c0225ec9c..05d8a187e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2361,4 +2361,15 @@ public class CraftWorld implements World {
@@ -2362,4 +2362,15 @@ public class CraftWorld implements World {
public DragonBattle getEnderDragonBattle() {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
}
@ -84,10 +84,10 @@ index d97716027..ad39408ef 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 1f990cbfa..64d8dba52 100644
index 7c1a22d63..3f3729517 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1052,4 +1052,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1070,4 +1070,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
return perm;
}

10
CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From d0c967f6769af67732741530b27fbbc46930b70b Mon Sep 17 00:00:00 2001
From a72a1112c768a77ce006f578a85040475245e85a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@ -31,12 +31,12 @@ index 5ab42a5e0..3a902d7a2 100644
} else {
a(entityitem, itemstack1, this, itemstack);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index b856486c2..0826750b7 100644
index 1be8babf3..7bcf04042 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -596,6 +596,23 @@ public class CraftEventFactory {
} else if (entity.getBukkitEntity() instanceof org.bukkit.entity.LightningStrike) {
LightningStrikeEvent.Cause cause = (spawnReason == SpawnReason.COMMAND ? LightningStrikeEvent.Cause.COMMAND : LightningStrikeEvent.Cause.UNKNOWN);
@@ -611,6 +611,23 @@ public class CraftEventFactory {
return true;
}
event = CraftEventFactory.callLightningStrikeEvent((LightningStrike) entity.getBukkitEntity(), cause);
+ // Spigot start
+ } else if (entity instanceof EntityExperienceOrb) {

20
CraftBukkit-Patches/0006-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From e09dbd2723c23b0e3fe15637cf1482b80ce9185d Mon Sep 17 00:00:00 2001
From 7fb143e4edf53f66474157e5056894de1d68c399 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
@ -133,10 +133,10 @@ index db424a6e1..51a8f7967 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 bcb0f18b3..73301e796 100644
index 05d8a187e..fad5223a2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -397,6 +397,7 @@ public class CraftWorld implements World {
@@ -398,6 +398,7 @@ public class CraftWorld implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
@ -144,7 +144,7 @@ index bcb0f18b3..73301e796 100644
if (isChunkLoaded(x, z)) {
world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1, Unit.INSTANCE);
}
@@ -405,6 +406,7 @@ public class CraftWorld implements World {
@@ -406,6 +407,7 @@ public class CraftWorld implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@ -152,7 +152,7 @@ index bcb0f18b3..73301e796 100644
if (!isChunkLoaded(x, z)) {
return true;
}
@@ -419,6 +421,7 @@ public class CraftWorld implements World {
@@ -420,6 +422,7 @@ public class CraftWorld implements World {
@Override
public boolean regenerateChunk(int x, int z) {
@ -160,7 +160,7 @@ index bcb0f18b3..73301e796 100644
throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
/*
if (!unloadChunk0(x, z, false)) {
@@ -470,6 +473,7 @@ public class CraftWorld implements World {
@@ -471,6 +474,7 @@ public class CraftWorld implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@ -168,7 +168,7 @@ index bcb0f18b3..73301e796 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.
@@ -1101,6 +1105,7 @@ public class CraftWorld implements World {
@@ -1102,6 +1106,7 @@ public class CraftWorld implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@ -176,7 +176,7 @@ index bcb0f18b3..73301e796 100644
Validate.notNull(boundingBox, "Bounding box is null!");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -1255,6 +1260,7 @@ public class CraftWorld implements World {
@@ -1256,6 +1261,7 @@ public class CraftWorld implements World {
@Override
public void save() {
@ -185,10 +185,10 @@ index bcb0f18b3..73301e796 100644
boolean oldSave = world.noSave;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 64d8dba52..d99451f27 100644
index 3f3729517..dbd2dcad0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -528,6 +528,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -530,6 +530,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@Override
public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) {

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

@ -1,4 +1,4 @@
From 0c5f647caa91bc166e84dd5caa089e9cdaa36148 Mon Sep 17 00:00:00 2001
From a32fc5cd7c080bf296d2f2902f0f92a320939b9f 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 38dd1ca4d..c83afc3d0 100644
entityplayer1.unsetRemoved();
entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 73301e796..10b11bb86 100644
index fad5223a2..088babd9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2368,6 +2368,13 @@ public class CraftWorld implements World {
@@ -2369,6 +2369,13 @@ public class CraftWorld implements World {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
}

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

@ -1,4 +1,4 @@
From adb0f3ca5fdd4affb582ca73cc94a32863316dd4 Mon Sep 17 00:00:00 2001
From 677aebc0a8a067e52eb6734e8622f1d8a8b2a030 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
@ -26,10 +26,10 @@ index d96d92c81..c4d74bede 100644
this.level.a(this.locX(), this.locY(), this.locZ(), SoundEffects.LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F, false);
this.level.a(this.locX(), this.locY(), this.locZ(), SoundEffects.LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F, false);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 10b11bb86..35b6ffe6c 100644
index 088babd9d..d79561cc2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2378,6 +2378,26 @@ public class CraftWorld implements World {
@@ -2379,6 +2379,26 @@ public class CraftWorld implements World {
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{

6
CraftBukkit-Patches/0083-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From b5459ea76565e30903d39ca491f32f6f20cb9992 Mon Sep 17 00:00:00 2001
From d7e759c781d8c839a8b9bfe3fb364555f3cfb910 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -100,7 +100,7 @@ index 6d251a56f..92b18858d 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index d99451f27..f1c8ae9cf 100644
index dbd2dcad0..ab90b361f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
@ -111,7 +111,7 @@ index d99451f27..f1c8ae9cf 100644
import net.minecraft.core.BlockPosition;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
@@ -1057,6 +1058,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1075,6 +1076,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Spigot start
private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
{

6
CraftBukkit-Patches/0087-Implement-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From ea019f10daab41d98e630a7f70e971046c8381e6 Mon Sep 17 00:00:00 2001
From ccdfd7f23159fd794d892da1dae83c4a955c7224 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -28,7 +28,7 @@ index 0b744b2d7..e330ff646 100644
if (!worldserver.addAllEntitiesSafely(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
this.d(worldserver, blockposition);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 0826750b7..1494d409d 100644
index 7bcf04042..b34d92f7c 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -225,6 +225,8 @@ import org.bukkit.inventory.InventoryView;
@ -40,7 +40,7 @@ index 0826750b7..1494d409d 100644
public class CraftEventFactory {
public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.ON_FIRE);
public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC);
@@ -1433,6 +1435,21 @@ public class CraftEventFactory {
@@ -1448,6 +1450,21 @@ public class CraftEventFactory {
return event;
}