OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Patch rebuild.

Browse source
This commit is contained in:
md_5 2016-03-03 08:28:13 +11:00 committed by Zach Brown
parent 5842265ff0
commit 216dd304c5
14 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From e13667d0360393598b38b158b13e1d1018d7bd68 Mon Sep 17 00:00:00 2001
From 365c56c933162839fb5c704ca93fa07f0ef3bea8 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,7 +25,7 @@ index d330226..6b37266 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 45b5de6..3777f40 100644
index 7023979..064571b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1451,4 +1451,14 @@ public class CraftWorld implements World {
@ -104,10 +104,10 @@ index 64e346d..243e8e5 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fb81a28..2c3ee37 100644
index 0f9eeb9..1c41902 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1406,4 +1406,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1402,4 +1402,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket(packetplayoutworldparticles);
}

10
CraftBukkit-Patches/0035-Player-Collision-API.patch
View file

@ -1,11 +1,11 @@
From d3abf8e422cced1d74772b9b14e361d65dc2a0f8 Mon Sep 17 00:00:00 2001
From e2982d4921555e9bd7fa15d7c95b38253253cf5f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index ce50925..7738af4 100644
index cd32f39..950a25a 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -376,6 +376,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -38,7 +38,7 @@ index 36ef280..c2f5ee1 100644
Entity entity = (Entity) list.get(i);
// TODO better check now?
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 846566e..6cda7b9 100644
index a67e0a8..91b5e2e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -65,6 +65,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -64,10 +64,10 @@ index 846566e..6cda7b9 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cd51b41..17a074a 100644
index 64cfbe9..eea3951 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1411,6 +1411,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1407,6 +1407,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

8
CraftBukkit-Patches/0038-Cap-Minimum-Player-Speed.patch
View file

@ -1,14 +1,14 @@
From 248808468f949313874e7bcbb268e89ee3ea5bc7 Mon Sep 17 00:00:00 2001
From b07dbc551cf636d98d6d7d99a0fa371f57b614ef Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 17a074a..b20ccc1 100644
index eea3951..f7e6c07 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1179,7 +1179,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1175,7 +1175,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setFlySpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@ -17,7 +17,7 @@ index 17a074a..b20ccc1 100644
player.updateAbilities();
}
@@ -1188,7 +1188,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1184,7 +1184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setWalkSpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();

6
CraftBukkit-Patches/0042-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From b1f94449576d07debe8a8f9ff1c665328b259b57 Mon Sep 17 00:00:00 2001
From ece598b449d1a8fe3073de1e90068246dd1cbf75 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b20ccc1..d62cc5b 100644
index f7e6c07..d245755 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1424,6 +1424,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1420,6 +1420,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().i = collides; // First boolean of Entity
}

6
CraftBukkit-Patches/0048-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From b43b46d1e7cdf0bff17e50a7e00f9f93faf9ee33 Mon Sep 17 00:00:00 2001
From abc10e573e1f4f0c7d755ef8d96a1e4aa1381c17 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -149,10 +149,10 @@ index 72e1e2f..1a5f14d 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 d62cc5b..1f11c9d 100644
index d245755..71d4ddc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1413,6 +1413,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1409,6 +1409,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
@Override

10
CraftBukkit-Patches/0053-Particle-API.patch
View file

@ -1,4 +1,4 @@
From 99daf1566a45a6d3e3e9e8122eec9d6cc17a0057 Mon Sep 17 00:00:00 2001
From 676559ff1621b188ff50dca42b5ec0a1e8e64e62 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -19,7 +19,7 @@ index 7de0de5..13f9e9d 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 2b6928f..84b6e41 100644
index 83d228a..29f6cff 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -828,28 +828,18 @@ public class CraftWorld implements World {
@ -132,10 +132,10 @@ index 2b6928f..84b6e41 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1f11c9d..30cef72 100644
index 71d4ddc..e3ecd4d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -319,9 +319,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -315,9 +315,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void playEffect(Location loc, Effect effect, int data) {
if (getHandle().playerConnection == null) return;
@ -146,7 +146,7 @@ index 1f11c9d..30cef72 100644
}
@Override
@@ -1439,6 +1437,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1435,6 +1433,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}

6
CraftBukkit-Patches/0057-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,14 +1,14 @@
From 2dfb8b1defba6566e19ab064918bb1b9316e69e6 Mon Sep 17 00:00:00 2001
From 20018eca9a63874370634de3f0550b33be542448 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 30cef72..7c9f8e2 100644
index e3ecd4d..28fc6e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1238,7 +1238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1234,7 +1234,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

8
CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch
View file

@ -1,11 +1,11 @@
From 2514d0515c9a29dafd7394e6c6f0becb9d81334e Mon Sep 17 00:00:00 2001
From 91de49dc685e28082f2060813a712900d00ef634 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6cda7b9..2f1d95b 100644
index 91b5e2e..7df4d87 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -25,7 +25,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -18,10 +18,10 @@ index 6cda7b9..2f1d95b 100644
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7c9f8e2..79c9267 100644
index 28fc6e6..8307458 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1494,6 +1494,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1490,6 +1490,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket( packet );
}
}

6
CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 8b1cdd8774c5e2290e60cbc7f2df4de530df81e0 Mon Sep 17 00:00:00 2001
From 42830031dfc5b195e41d63fc7a07b36a0805af2a Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 79c9267..6e4ecbe 100644
index 8307458..a725cf6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1500,6 +1500,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1496,6 +1496,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}

6
CraftBukkit-Patches/0075-Cap-Channel-Registrations.patch
View file

@ -1,14 +1,14 @@
From 15992a6545ebf64c4125cc9c71680827b5e85efa Mon Sep 17 00:00:00 2001
From 8b992f8c14428b6cf9f074c284f561fdf6f8315b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 20:02:58 +1100
Subject: [PATCH] Cap Channel Registrations
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6e4ecbe..c5fdd6d 100644
index a725cf6..92e14d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1058,6 +1058,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1054,6 +1054,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

12
CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch
View file

@ -1,14 +1,14 @@
From 023d703153ac0998fb8887392a6c55f8e8ce4fc4 Mon Sep 17 00:00:00 2001
From 130bdfbe5d26dffdaf367a0a587aa3ac1be103b5 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 26 Jun 2014 23:42:52 +0100
Subject: [PATCH] Add damager to the unhandled error
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index b7d747c..b9ba131 100644
index f9ab062..1946c05 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -170,7 +170,7 @@ public class CraftEventFactory {
@@ -184,7 +184,7 @@ public class CraftEventFactory {
*/
public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {
if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
@ -17,7 +17,7 @@ index b7d747c..b9ba131 100644
}
return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack);
}
@@ -468,7 +468,7 @@ public class CraftEventFactory {
@@ -482,7 +482,7 @@ public class CraftEventFactory {
if (source == DamageSource.CACTUS) {
cause = DamageCause.CONTACT;
} else {
@ -26,7 +26,7 @@ index b7d747c..b9ba131 100644
}
EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
if (!event.isCancelled()) {
@@ -488,7 +488,7 @@ public class CraftEventFactory {
@@ -502,7 +502,7 @@ public class CraftEventFactory {
} else if (source == DamageSource.DRAGON_BREATH) {
cause = DamageCause.DRAGON_BREATH;
} else {
@ -35,7 +35,7 @@ index b7d747c..b9ba131 100644
}
EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
if (!event.isCancelled()) {
@@ -528,7 +528,7 @@ public class CraftEventFactory {
@@ -542,7 +542,7 @@ public class CraftEventFactory {
return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
}

6
CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From 2b3de9dd1ca7d6d57e840342da812740bc360e2f Mon Sep 17 00:00:00 2001
From f96164c1f3d6856df8008b2be6afc7ac1ce03a17 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c5fdd6d..b1521b6 100644
index 92e14d4..8fefb1f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1308,7 +1308,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1304,7 +1304,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break;
}
}

8
CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch
View file

@ -1,14 +1,14 @@
From a3416510c442229effa85bc8e324ec85f92dd4ce Mon Sep 17 00:00:00 2001
From d472c384eb888ed28249067169242d42a375382c Mon Sep 17 00:00:00 2001
From: lazertester <austin.techhead@gmail.com>
Date: Sun, 17 Aug 2014 19:56:17 +1000
Subject: [PATCH] Add Hunger Config Values
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 7738af4..53936de 100644
index 950a25a..1ad18f4 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1138,7 +1138,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1140,7 +1140,7 @@ public abstract class EntityHuman extends EntityLiving {
}
}
@ -17,7 +17,7 @@ index 7738af4..53936de 100644
} else {
this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dY, this.bz(), 1.0F, 1.0F);
if (flag4) {
@@ -1405,9 +1405,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1407,9 +1407,9 @@ public abstract class EntityHuman extends EntityLiving {
super.ch();
this.b(StatisticList.w);
if (this.isSprinting()) {

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

@ -1,4 +1,4 @@
From d49b826db9f982fd0909efd219787ce33707c356 Mon Sep 17 00:00:00 2001
From 24e6c6941fbbb67401365dea9f85460add367e33 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 13:06:05 +1100
Subject: [PATCH] BungeeCord Chat API
@ -65,7 +65,7 @@ index cabb3e5..7831a12 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b1521b6..9298344 100644
index 8fefb1f..250f112 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -19,6 +19,7 @@ import java.util.Set;
@ -76,7 +76,7 @@ index b1521b6..9298344 100644
import net.minecraft.server.*;
import net.minecraft.server.PacketPlayOutTitle.EnumTitleAction;
@@ -1521,6 +1522,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1517,6 +1518,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}