CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild patches for upstream API addition

Browse Source 
Removes ArmorStand Marker API as that was added to Bukkit
This commit is contained in:
Zach Brown 2015-06-10 22:35:26 -05:00
parent b59cf404af
commit 6b6eb8f7f7
15 changed files with 47 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/0004-Player-affects-spawning-API.patch
View File

@ -1,14 +1,14 @@
From 3194361c9d0363a1b1e1385fd5ccf0d66aeec37c Mon Sep 17 00:00:00 2001
From 6d1840fc74641a4aec920b5be691d14efaa8df6d Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 8 Aug 2014 22:51:26 -0500
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b86b85d..323051f 100644
index 83cc008..5c5e818 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1120,6 +1120,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1131,6 +1131,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -38,5 +38,5 @@ index b86b85d..323051f 100644
Spigot spigot();
--
2.4.1.windows.1
2.4.2.windows.1

34
Spigot-API-Patches/0011-Add-ArmorStand-Marker-NBT-API.patch
View File

@ -1,34 +0,0 @@
From 6271c78a73f37bbbbacb527db1f4b772ebddae01 Mon Sep 17 00:00:00 2001
From: Anonymoose <MrAnonHimself@anon.life>
Date: Sun, 3 May 2015 17:44:20 -0500
Subject: [PATCH] Add ArmorStand Marker NBT API
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
index b323e73..5b6623c 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -258,4 +258,20 @@ public interface ArmorStand extends LivingEntity {
* @param small whether this is scaled down
*/
void setSmall(boolean small);
+
+ /**
+ * Returns whether this armor stand has a small
+ * bounding box. This gets the NBT Marker tag
+ *
+ * @return whether the bounding box is small or not
+ */
+ boolean isSmallBoundingBox();
+
+ /**
+ * Sets whether this armor stand should have a small
+ * bounding box. This sets the NBT Marker tag
+ *
+ * @param small whether the bounding box is small or not
+ */
+ void setSmallBoundingBox(boolean small);
}
--
1.9.1

8
Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
View File

@ -1,4 +1,4 @@
From 24cad00cdef7d8d428d6d3bf1002f02e8c468699 Mon Sep 17 00:00:00 2001
From b87c4f1f38529e2a133fc96231d7a89c262695d1 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 18 May 2015 17:52:45 -0500
Subject: [PATCH] Player affects spawning API
@ -167,10 +167,10 @@ index 8bcb4ad..fae5eb7 100644
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 40ee4d3..130dcce 100644
index 3162541..8fd876f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -6,6 +6,7 @@ import io.netty.buffer.Unpooled;
@@ -7,6 +7,7 @@ import io.netty.buffer.Unpooled;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -178,7 +178,7 @@ index 40ee4d3..130dcce 100644
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.ArrayList;
@@ -1443,6 +1444,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1450,6 +1451,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
}

8
Spigot-Server-Patches/0029-Only-refresh-abilities-if-needed.patch
View File

@ -1,14 +1,14 @@
From 91e1a03598b3c340ad7d81d50767be446924b959 Mon Sep 17 00:00:00 2001
From f157ea7c4424311ec0fd7ab9a901a4bbc8edf10c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 13:20:22 -0600
Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 130dcce..3c5d90d 100644
index 8fd876f..6342de7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1147,12 +1147,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1148,12 +1148,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setFlying(boolean value) {
@ -24,5 +24,5 @@ index 130dcce..3c5d90d 100644
@Override
--
2.4.1.windows.1
2.4.2.windows.1

6
Spigot-Server-Patches/0030-Player-lookup-improvements.patch
View File

@ -1,4 +1,4 @@
From 44f7767ad24c505b3433c914d3d9bb7a2af305b1 Mon Sep 17 00:00:00 2001
From 92736fc7145b3f862bbd072e258bf9edf7947447 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 04:03:56 -0500
Subject: [PATCH] Player lookup improvements
@ -153,10 +153,10 @@ index 46bc341..b62a6a2 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3c5d90d..ae75b36 100644
index 6342de7..68f18d1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -105,13 +105,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -106,13 +106,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public boolean isOnline() {

52
Spigot-Server-Patches/0046-Add-ArmorStand-Marker-NBT-API.patch
View File

@ -1,52 +0,0 @@
From 9c14cfeecf183a246c29017b115a14bcdb05f2b5 Mon Sep 17 00:00:00 2001
From: Anonymoose <MrAnonHimself@anon.life>
Date: Sun, 3 May 2015 17:44:20 -0500
Subject: [PATCH] Add ArmorStand Marker NBT API
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index a0ad85b..bbf313d 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -646,7 +646,7 @@ public class EntityArmorStand extends EntityLiving {
return (this.datawatcher.getByte(10) & 8) != 0;
}
- private void n(boolean flag) {
+ public void n(boolean flag) { // PaperSpigot - private -> public, setSmallBoundingBox (Marker) NBT
byte b0 = this.datawatcher.getByte(10);
if (flag) {
@@ -658,7 +658,7 @@ public class EntityArmorStand extends EntityLiving {
this.datawatcher.watch(10, Byte.valueOf(b0));
}
- public boolean s() {
+ public boolean s() { // PaperSpigot - isSmallBoundingBox
return (this.datawatcher.getByte(10) & 16) != 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 741b765..591c5a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -204,4 +204,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
(float) Math.toDegrees(old.getZ())
);
}
+
+ // PaperSpigot start - Implement bounding box (Marker) API
+ @Override
+ public boolean isSmallBoundingBox() {
+ return getHandle().s();
+ }
+
+ @Override
+ public void setSmallBoundingBox(boolean small) {
+ getHandle().n(small);
+ }
+ // PaperSpigot end
}
--
2.4.2.windows.1

6
Spigot-Server-Patches/0047-Fix-jar-being-shaded-multiple-times.patch → Spigot-Server-Patches/0046-Fix-jar-being-shaded-multiple-times.patch
View File

@ -1,11 +1,11 @@
From f8a08f5a78478854fa5b0d9eefa87cf6db3c8c08 Mon Sep 17 00:00:00 2001
From c5a5d26a0e6cb3a0b24fb5e34cd0b5e70080bcfa Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Thu, 30 Apr 2015 22:42:34 -0400
Subject: [PATCH] Fix jar being shaded multiple times
diff --git a/pom.xml b/pom.xml
index 6aeddce..60c1bd0 100644
index bc0a4a6..1359743 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
@ -17,5 +17,5 @@ index 6aeddce..60c1bd0 100644
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
--
1.9.5.msysgit.1
2.4.2.windows.1

8
Spigot-Server-Patches/0048-Configurable-end-credits-when-leaving-the-end.patch → Spigot-Server-Patches/0047-Configurable-end-credits-when-leaving-the-end.patch
View File

@ -1,11 +1,11 @@
From 5257c2152e280fff97b350cc909373afc16586d9 Mon Sep 17 00:00:00 2001
From d1648cfa0731ff5038989e59f95ebef8a013bce8 Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com>
Date: Thu, 28 May 2015 20:12:38 -0500
Subject: [PATCH] Configurable end credits when leaving the end
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6ec167f..2ecec5a 100644
index c268145..592fb75 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -508,11 +508,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -51,7 +51,7 @@ index 6ec167f..2ecec5a 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index f4f78e8..fac50e4 100644
index 617f26c..a698e84 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -693,6 +693,8 @@ public abstract class PlayerList {
@ -89,5 +89,5 @@ index 3c011c2..e14e961 100644
+ }
}
--
1.9.5.msysgit.1
2.4.2.windows.1

6
Spigot-Server-Patches/0049-Force-load-chunks-for-specific-entities-that-fly-thr.patch → Spigot-Server-Patches/0048-Force-load-chunks-for-specific-entities-that-fly-thr.patch
View File

@ -1,4 +1,4 @@
From 20ef67da6f0df0601f190b8809d6a7a7176201c2 Mon Sep 17 00:00:00 2001
From b9323137c152e0205ab6b1a5112689f17c53ce30 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 May 2015 22:01:25 -0500
Subject: [PATCH] Force load chunks for specific entities that fly through
@ -104,7 +104,7 @@ index 1daba4e..db33c98 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 86913f4..385d742 100644
index f507134..aec39a8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1641,6 +1641,17 @@ public abstract class World implements IBlockAccess {
@ -169,5 +169,5 @@ index 7ca1b24..dcab40c 100644
return true;
}
--
1.9.5.msysgit.1
2.4.2.windows.1

12
Spigot-Server-Patches/0050-Teleport-passenger-vehicle-with-player.patch → Spigot-Server-Patches/0049-Teleport-passenger-vehicle-with-player.patch
View File

@ -1,11 +1,11 @@
From 8d7a7e6e06ca173cf6e69624b5a432977ca25f73 Mon Sep 17 00:00:00 2001
From 92fdbc3acf9242e72da544a63dcd1b7efb93f6ff Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 31 May 2015 01:44:02 -0500
Subject: [PATCH] Teleport passenger/vehicle with player
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 79837ef..8925697 100644
index 2611007..16dbc20 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -41,6 +41,15 @@ public abstract class Entity implements ICommandListener {
@ -47,10 +47,10 @@ index 79837ef..8925697 100644
if (j == 1 && i == 1) {
BlockPosition blockposition = this.world.r(worldserver1.getSpawn());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ae75b36..f12cf8a 100644
index 68f18d1..269a891 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -448,7 +448,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -449,7 +449,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// If this player is riding another entity, we must dismount before teleporting.
@ -79,7 +79,7 @@ index ae75b36..f12cf8a 100644
// Update the From Location
from = event.getFrom();
@@ -469,6 +489,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -470,6 +490,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} else {
server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
}
@ -97,5 +97,5 @@ index ae75b36..f12cf8a 100644
}
--
1.9.5.msysgit.1
2.4.2.windows.1

8
Spigot-Server-Patches/0051-Stackable-Buckets.patch → Spigot-Server-Patches/0050-Stackable-Buckets.patch
View File

@ -1,4 +1,4 @@
From dc006c675c9b591b911bad185bf11b9a68b3372d Mon Sep 17 00:00:00 2001
From 456deeeb09db90108d671cf1f8db3ccd4a2c0714 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 1 Jun 2015 22:21:52 -0700
Subject: [PATCH] Stackable Buckets
@ -65,7 +65,7 @@ index 91ea70d..8e3d77e 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3b1be6f..7663049 100644
index 9b97e2c..4fd432b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -61,6 +61,8 @@ import org.bukkit.inventory.InventoryView;
@ -98,7 +98,7 @@ index 3b1be6f..7663049 100644
case DENY:
/* Needs enum constructor in InventoryAction
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
index 3ab2892..b189ba4 100644
index ab21bbf..aba8f87 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
@@ -3,14 +3,19 @@ package org.github.paperspigot;
@ -170,5 +170,5 @@ index 3ab2892..b189ba4 100644
+ }
}
--
1.9.5.msysgit.1
2.4.2.windows.1

6
Spigot-Server-Patches/0052-Fix-lag-from-explosions-processing-dead-entities.patch → Spigot-Server-Patches/0051-Fix-lag-from-explosions-processing-dead-entities.patch
View File

@ -1,11 +1,11 @@
From fca81c0d7fe54905b1c7891ed88ff7cba6e419ca Mon Sep 17 00:00:00 2001
From 790447669c1b76aaf801a79bdce97b13ba4c8e33 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv>
Date: Mon, 1 Jun 2015 22:54:18 -0700
Subject: [PATCH] Fix lag from explosions processing dead entities
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 3720006..fdf886a 100644
index 85f2ab5..349854f 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -103,7 +103,14 @@ public class Explosion {
@ -25,5 +25,5 @@ index 3720006..fdf886a 100644
for (int l1 = 0; l1 < list.size(); ++l1) {
--
1.9.5.msysgit.1
2.4.2.windows.1

4
Spigot-Server-Patches/0053-Generator-Settings.patch → Spigot-Server-Patches/0052-Generator-Settings.patch
View File

@ -1,4 +1,4 @@
From d3ce5089173313a357823c89c3d000244f1fc8b7 Mon Sep 17 00:00:00 2001
From 7be77b35db2b5abe1e1b6472738d27f8394b8ed4 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 2 Jun 2015 00:41:23 -0700
Subject: [PATCH] Generator Settings
@ -276,5 +276,5 @@ index f51962e..8338cc6 100644
+ }
}
--
1.9.5.msysgit.1
2.4.2.windows.1

8
Spigot-Server-Patches/0054-Configurable-TNT-cannon-fix.patch → Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch
View File

@ -1,4 +1,4 @@
From 9731a3cad42fe83dbe25013238a3fbca97bf2ad6 Mon Sep 17 00:00:00 2001
From 3858cdd37e152fb8db8c5618a7ea4d10fa49605c Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv>
Date: Thu, 4 Jun 2015 13:55:02 -0700
Subject: [PATCH] Configurable TNT cannon fix
@ -85,7 +85,7 @@ index 6a7e7b3..78c6d19 100644
int i = aenumdirection.length;
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
index ea87aa5..3e3848e 100644
index e5c675e..532188e 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -142,6 +142,17 @@ public class BlockRedstoneWire extends Block {
@ -277,7 +277,7 @@ index db33c98..5290767 100644
+ // PaperSpigot end
}
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index fdf886a..a3df604 100644
index 349854f..f40f465 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -142,9 +142,16 @@ public class Explosion {
@ -346,5 +346,5 @@ index 8338cc6..3edd322 100644
+ }
}
--
1.9.5.msysgit.1
2.4.2.windows.1

6
Spigot-Server-Patches/0055-FallingBlock-and-TNT-entities-collide-with-specific-.patch → Spigot-Server-Patches/0054-FallingBlock-and-TNT-entities-collide-with-specific-.patch
View File

@ -1,11 +1,11 @@
From 8ff5ffa432d70ca0644359e610027cb7a6a14120 Mon Sep 17 00:00:00 2001
From e53196a56adedd249e59f64343d7a790ffb11649 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Fri, 5 Jun 2015 00:43:17 -0700
Subject: [PATCH] FallingBlock and TNT entities collide with specific blocks
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 385d742..78b4f05 100644
index aec39a8..8258c25 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1200,7 +1200,16 @@ public abstract class World implements IBlockAccess {
@ -42,5 +42,5 @@ index 3edd322..3f42ca9 100644
+ }
}
--
1.9.5.msysgit.1
2.4.2.windows.1