Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-04 17:37:36 +02:00
Code Issues Projects Releases Wiki Activity

rebuild

Browse Source
This commit is contained in:
Gabscap 2016-03-25 02:23:23 +01:00
parent ba4c7e9e8b
commit a897a66edf
7 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch
View File

@ -1,4 +1,4 @@
From c7b2b2ddcf7ac61c50fb7b69772e49b430a7f983 Mon Sep 17 00:00:00 2001
From 72774aa0bf9f030691277376ba584658650c8cce Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] FallingBlock and TNTPrimed source location API
@ -74,7 +74,7 @@ index d7bea3d..c1c0c7c 100644
world.addEntity(entitytntprimed);
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 4c8e336..c44e493 100644
index 6246c05..5e8523d 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -17,13 +17,25 @@ public class EntityFallingBlock extends Entity {
@ -193,10 +193,10 @@ index 564ea37..1820c7b 100644
public EntityLiving getSource() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a487c2f..33c3428 100644
index 83e3003..25edfb8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -916,7 +916,10 @@ public class CraftWorld implements World {
@@ -921,7 +921,10 @@ public class CraftWorld implements World {
double y = location.getBlockY() + 0.5;
double z = location.getBlockZ() + 0.5;
@ -208,7 +208,7 @@ index a487c2f..33c3428 100644
entity.ticksLived = 1;
world.addEntity(entity, SpawnReason.CUSTOM);
@@ -952,7 +955,10 @@ public class CraftWorld implements World {
@@ -957,7 +960,10 @@ public class CraftWorld implements World {
int type = CraftMagicNumbers.getId(blockData.getBlock());
int data = blockData.getBlock().toLegacyData(blockData);
@ -220,7 +220,7 @@ index a487c2f..33c3428 100644
} else if (Projectile.class.isAssignableFrom(clazz)) {
if (Snowball.class.isAssignableFrom(clazz)) {
entity = new EntitySnowball(world, x, y, z);
@@ -1157,7 +1163,8 @@ public class CraftWorld implements World {
@@ -1162,7 +1168,8 @@ public class CraftWorld implements World {
throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
}
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {

11
Spigot-Server-Patches/0032-Configurable-end-credits.patch
View File

@ -1,4 +1,4 @@
From 72c2f2efed002ce3792cfb50fb51c67d5da91a17 Mon Sep 17 00:00:00 2001
From 68c014e72798406a3e96d89f8ba4871a74893f7e Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com>
Date: Wed, 16 Mar 2016 02:21:39 -0500
Subject: [PATCH] Configurable end credits
@ -20,10 +20,10 @@ index 9991a4a..1b88731 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ff0939b..987164e 100644
index 8f57b21..47ba1e3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -523,13 +523,25 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -523,6 +523,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return this.world.pvpMode;
}
@ -37,8 +37,9 @@ index ff0939b..987164e 100644
+ }
+
public Entity c(int i) {
this.cj = true;
//this.cj = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
if (this.dimension == 1 && i == 1) {
@@ -530,7 +539,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.world.kill(this);
if (!this.viewingCredits) {
this.viewingCredits = true;
@ -51,5 +52,5 @@ index ff0939b..987164e 100644
} else {
this.b((Statistic) AchievementList.D);
--
2.7.3
2.7.4

8
Spigot-Server-Patches/0056-Process-Entity-Chunk-Registration-on-Teleport.patch
View File

@ -1,4 +1,4 @@
From 6a48b3d2cb803c53f6205944ad5c6703b0f9e78f Mon Sep 17 00:00:00 2001
From 577e962b96bc760bdea8982b8e2d0d4df648e265 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 00:12:23 -0600
Subject: [PATCH] Process Entity Chunk Registration on Teleport
@ -6,10 +6,10 @@ Subject: [PATCH] Process Entity Chunk Registration on Teleport
Fixes many issues with entities not being properly "switched" to their new chunk on teleport
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 6f4b46f..7803641 100644
index 3b29578..6fdfee6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -253,6 +253,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -242,6 +242,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// entity.world = ((CraftWorld) location.getWorld()).getHandle();
// Spigot end
entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
@ -18,5 +18,5 @@ index 6f4b46f..7803641 100644
return true;
}
--
2.7.3
2.7.4

8
Spigot-Server-Patches/0073-Add-velocity-warnings.patch
View File

@ -1,14 +1,14 @@
From c0c895ffba73be2f733ccfb141f2c957381d8bf9 Mon Sep 17 00:00:00 2001
From 4fe15e0c20e1d2d49ea0af87c3401825deae634a Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 7803641..92f2cf9 100644
index 6fdfee6..5f1ebfa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -215,6 +215,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -204,6 +204,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public void setVelocity(Vector vel) {
@ -22,5 +22,5 @@ index 7803641..92f2cf9 100644
entity.motY = vel.getY();
entity.motZ = vel.getZ();
--
2.7.3
2.7.4

8
Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 119a007a2fc330ca432c1f37d041d4b4b35192bf Mon Sep 17 00:00:00 2001
From ea3799b01832cc9a0d3d4b522e649d3845f12ecf Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -198,7 +198,7 @@ index 6f013eb..054cf63 100644
}
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index 4c39b54..aa74c87 100644
index da6d694..2ca94a4 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -1,5 +1,6 @@
@ -216,7 +216,7 @@ index 4c39b54..aa74c87 100644
}
}
@@ -247,6 +249,7 @@ public class RegionFile {
@@ -246,6 +248,7 @@ public class RegionFile {
this.b(i, j, (int) (MinecraftServer.av() / 1000L));
} catch (IOException ioexception) {
ioexception.printStackTrace();
@ -372,5 +372,5 @@ index 44e057c..cf0bd0c 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
--
2.7.2.windows.1
2.7.4

8
Spigot-Server-Patches/0083-Chunk-Save-Reattempt.patch
View File

@ -1,4 +1,4 @@
From 8136953d20cd31bbf60401988b9be1e6373fdcfb Mon Sep 17 00:00:00 2001
From fa15f3b5ad7afc8dbcf837c8fb8e8f0bee4ba2e9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Mar 2013 23:46:10 -0500
Subject: [PATCH] Chunk Save Reattempt
@ -28,10 +28,10 @@ index 336e780..7eb13f8 100644
synchronized (lock) { if (this.b.get(chunkcoordintpair) == nbttagcompound) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index aa74c87..9d07be1 100644
index 2ca94a4..68dd17d 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -248,8 +248,7 @@ public class RegionFile {
@@ -247,8 +247,7 @@ public class RegionFile {
this.b(i, j, (int) (MinecraftServer.av() / 1000L));
} catch (IOException ioexception) {
@ -42,5 +42,5 @@ index aa74c87..9d07be1 100644
}
--
2.7.3
2.7.4

6
Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch
View File

@ -1,4 +1,4 @@
From fe5e6a8d13715121e59f1b96e123c54174144e29 Mon Sep 17 00:00:00 2001
From a181aafdb512be1e3e0dbbdc772063241aaf6339 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 17:57:25 -0400
Subject: [PATCH] Optimize Chunk Unload Queue
@ -261,7 +261,7 @@ index a6c8e53..d8bd36c 100644
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index be311cd..6307c19 100644
index c51c74b..caa5e62 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -206,7 +206,7 @@ public class CraftWorld implements World {
@ -299,7 +299,7 @@ index be311cd..6307c19 100644
if (neighbor != null) {
neighbor.setNeighborLoaded(-x, -z);
chunk.setNeighborLoaded(x, z);
@@ -1538,7 +1539,7 @@ public class CraftWorld implements World {
@@ -1543,7 +1544,7 @@ public class CraftWorld implements World {
}
// Already unloading?