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

Fix parent warning in PaperSpigot-API... and rebuild other patches

This commit is contained in:
Zach Brown 2015-01-11 01:10:11 -06:00
parent 788b857ddd
commit b7ea61e56b
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-API-Patches/0001-POM-changes.patch
View File

@ -1,15 +1,23 @@
From debed199d0ad68d2f21877b6a4f0f9dbe34e8073 Mon Sep 17 00:00:00 2001
From 75be04f38d3f75ac21ecad2bf1ee949e419247da Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Tue, 6 Jan 2015 22:12:31 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 44aa858..14c056a 100644
index 44aa858..5981842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,13 +9,13 @@
<version>9</version>
@@ -4,18 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
</parent>
- <groupId>org.spigotmc</groupId>

8
Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch
View File

@ -1,11 +1,11 @@
From c57a1262f399cc774e58f645d037fd31b35ba72b Mon Sep 17 00:00:00 2001
From 47ddeac79b6d4daffa8e1d104d97691eb8fe7257 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 00:24:18 -0600
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 0a4b7f4..2e6e9c4 100644
index dfb4299..213a16b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -40,6 +40,13 @@ public abstract class Entity implements ICommandListener {
@ -22,7 +22,7 @@ index 0a4b7f4..2e6e9c4 100644
private static final AxisAlignedBB a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
private static int entityCount;
@@ -1948,7 +1955,7 @@ public abstract class Entity implements ICommandListener {
@@ -1941,7 +1948,7 @@ public abstract class Entity implements ICommandListener {
// minecraftserver.getPlayerList().changeWorld(this, j, worldserver, worldserver1);
boolean before = worldserver1.chunkProviderServer.forceChunkLoad;
worldserver1.chunkProviderServer.forceChunkLoad = true;
@ -31,7 +31,7 @@ index 0a4b7f4..2e6e9c4 100644
worldserver1.chunkProviderServer.forceChunkLoad = before;
// CraftBukkit end
this.world.methodProfiler.c("reloading");
@@ -1956,6 +1963,10 @@ public abstract class Entity implements ICommandListener {
@@ -1949,6 +1956,10 @@ public abstract class Entity implements ICommandListener {
if (entity != null) {
entity.n(this);