core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #781 from electronicboy/master 

Merge upstream!
This commit is contained in:
kashike 2017-07-09 03:12:19 -07:00 committed by GitHub
parent e0e23db485 1e4d3c3106
commit c860de53ec
6 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View File

@ -1,4 +1,4 @@
From 36615410da1b671be25fc315029b9fd9c5734efe Mon Sep 17 00:00:00 2001
From 53c72b748355d71cd710ab2fabc6758c55f1f792 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -46,15 +46,11 @@ index 5c05ae407..bfc42b12f 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 174763f23..35123d58b 100644
index 0c5862a3f..e3667e558 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -189,10 +189,10 @@ public class Main {
Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor());
Calendar deadline = Calendar.getInstance();
- deadline.add(Calendar.DAY_OF_YEAR, -7);
+ deadline.add(Calendar.DAY_OF_YEAR, -14); // Paper - Bump back to 14
@@ -192,7 +192,7 @@ public class Main {
deadline.add(Calendar.DAY_OF_YEAR, -14);
if (buildDate.before(deadline.getTime())) {
System.err.println("*** Error, this build is outdated ***");
- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***");
@ -97,5 +93,5 @@ index 94a3d4237..3ed983cc0 100644
log.log( Level.SEVERE, "------------------------------" );
//
--
2.13.0.windows.1
2.13.2

12
Spigot-Server-Patches/0162-Add-EntityZapEvent.patch
View File

@ -1,11 +1,11 @@
From 316e2901916e39082402b537e59db4ae638022a2 Mon Sep 17 00:00:00 2001
From 7337dbfb6832634fa92cdc007e2334018be708e0 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:30 -0700
Subject: [PATCH] Add EntityZapEvent
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 94d01172..fcf99e66 100644
index 94d011721..fcf99e668 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -158,6 +158,12 @@ public class EntityPig extends EntityAnimal {
@ -22,7 +22,7 @@ index 94d01172..fcf99e66 100644
if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
return;
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 70b12c5c..ae68f07a 100644
index 70b12c5cd..ae68f07ab 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -622,6 +622,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -48,10 +48,10 @@ index 70b12c5c..ae68f07a 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 6992a874..1caf1463 100644
index 4385cd969..bdeeac36f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -673,6 +673,14 @@ public class CraftEventFactory {
@@ -675,6 +675,14 @@ public class CraftEventFactory {
return event;
}
@ -67,5 +67,5 @@ index 6992a874..1caf1463 100644
HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
--
2.13.1.windows.2
2.13.2

10
Spigot-Server-Patches/0172-Add-source-to-PlayerExpChangeEvent.patch
View File

@ -1,11 +1,11 @@
From f0aac77f067340ebedeb2af0f2b288552fbd28b1 Mon Sep 17 00:00:00 2001
From a0f07e693a7588b712572531456ce10d93fc2284 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Thu, 8 Sep 2016 08:48:33 -0700
Subject: [PATCH] Add source to PlayerExpChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index b200bbf6..ec23eb98 100644
index b200bbf64..ec23eb98c 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
@ -18,7 +18,7 @@ index b200bbf6..ec23eb98 100644
this.die();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 1caf1463..c0794a5b 100644
index bdeeac36f..7422a91f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
@ -29,7 +29,7 @@ index 1caf1463..c0794a5b 100644
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.block.*;
@@ -645,6 +646,17 @@ public class CraftEventFactory {
@@ -647,6 +648,17 @@ public class CraftEventFactory {
return event;
}
@ -48,5 +48,5 @@ index 1caf1463..c0794a5b 100644
Block block = world.getWorld().getBlockAt(x, y, z);
CraftBlockState state = (CraftBlockState) block.getState();
--
2.13.1.windows.2
2.13.2

16
Spigot-Server-Patches/0176-Add-ProjectileCollideEvent.patch
View File

@ -1,11 +1,11 @@
From 4106fa942490f3f314a981b8ec7c63c59d35336e Mon Sep 17 00:00:00 2001
From 4cda6abfb75a1e47090cf7c87aac477a69da019a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Fri, 16 Dec 2016 21:25:39 -0600
Subject: [PATCH] Add ProjectileCollideEvent
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index f55eb654..1338f37f 100644
index f55eb654b..1338f37f3 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -25,7 +25,7 @@ index f55eb654..1338f37f 100644
this.a(movingobjectposition);
}
diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
index 365e070f..657b3b5a 100644
index 365e070f8..657b3b5ac 100644
--- a/src/main/java/net/minecraft/server/EntityFireball.java
+++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity {
@ -45,7 +45,7 @@ index 365e070f..657b3b5a 100644
this.a(movingobjectposition);
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 7f011aef..6ac89d1e 100644
index 7f011aef8..6ac89d1e3 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity {
@ -66,7 +66,7 @@ index 7f011aef..6ac89d1e 100644
vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
}
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
index 3d3c1f5f..0415c521 100644
index 3d3c1f5f9..0415c521d 100644
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@ -86,10 +86,10 @@ index 3d3c1f5f..0415c521 100644
if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
this.e(movingobjectposition.a());
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index c0794a5b..9e586fa8 100644
index 7422a91f0..16f6410b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -794,6 +794,16 @@ public class CraftEventFactory {
@@ -796,6 +796,16 @@ public class CraftEventFactory {
return CraftItemStack.asNMSCopy(bitem);
}
@ -107,5 +107,5 @@ index c0794a5b..9e586fa8 100644
Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
--
2.13.1.windows.2
2.13.2

14
Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch
View File

@ -1,11 +1,11 @@
From b7cacfd3918ba0245fce9ff90227e1d9dcd8f386 Mon Sep 17 00:00:00 2001
From a0c3fa1f62ecaf3d2855642eb1d209f091fb86b3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 16 Dec 2016 22:10:35 -0600
Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e6b469a0..314d1df4 100644
index e6b469a00..314d1df4b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@ -18,7 +18,7 @@ index e6b469a0..314d1df4 100644
protected int j;
private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index c0d97f15..36320917 100644
index c0d97f154..363209170 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -20,7 +20,7 @@ public class ItemBlock extends Item {
@ -31,7 +31,7 @@ index c0d97f15..36320917 100644
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 58b42882..4e316d28 100644
index 58b428827..4e316d286 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1807,6 +1807,33 @@ public abstract class World implements IBlockAccess {
@ -78,10 +78,10 @@ index 58b42882..4e316d28 100644
this.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 9e586fa8..16855803 100644
index 16f6410b2..883ef489f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -799,6 +799,13 @@ public class CraftEventFactory {
@@ -801,6 +801,13 @@ public class CraftEventFactory {
Projectile projectile = (Projectile) entity.getBukkitEntity();
org.bukkit.entity.Entity collided = position.entity.getBukkitEntity();
com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
@ -96,5 +96,5 @@ index 9e586fa8..16855803 100644
return event;
}
--
2.13.1.windows.2
2.13.2

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit d603539842fe24dc1b37130e47fafe734a542a69
Subproject commit 50b75cd65dd241a01d160d1a4e31de4e643be36e