Rebuild patches
This commit is contained in:
parent
502ffa0833
commit
ea565eff61
5 changed files with 23 additions and 23 deletions
|
@ -1,17 +1,17 @@
|
|||
From f63d437c04b5a57accd831c20410554f6bc534af Mon Sep 17 00:00:00 2001
|
||||
From f255e1de552da583447620334ba2df03daabf61d Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Fri, 17 Apr 2015 02:43:00 -0700
|
||||
Subject: [PATCH] Add FallingBlock source location API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
|
||||
index 1edd6e0..93b17e3 100644
|
||||
index bc56fa2..240a278 100644
|
||||
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
|
||||
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
|
||||
@@ -45,4 +45,11 @@ public interface FallingBlock extends Entity {
|
||||
* @param drop true to break into an item when obstructed
|
||||
@@ -59,4 +59,11 @@ public interface FallingBlock extends Entity {
|
||||
* @param hurtEntities whether entities will be damaged by this block.
|
||||
*/
|
||||
void setDropItem(boolean drop);
|
||||
void setHurtEntities(boolean hurtEntities);
|
||||
+
|
||||
+ /**
|
||||
+ * Gets the source block location of the falling block
|
||||
|
@ -21,5 +21,5 @@ index 1edd6e0..93b17e3 100644
|
|||
+ org.bukkit.Location getSourceLoc(); // PaperSpigot - Add FallingBlock source location API
|
||||
}
|
||||
--
|
||||
1.9.4.msysgit.2
|
||||
2.5.2
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a68c4df208780c136387eb71047b13171c4bc077 Mon Sep 17 00:00:00 2001
|
||||
From 7f66f69455e113664eaffd38fc0a8c4f1b37d8ad Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Sat, 7 Mar 2015 22:55:25 -0600
|
||||
Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 2079772..f42b95c 100644
|
||||
index 1d29ae7..9fc2cfa 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1022,7 +1022,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
@@ -1023,7 +1023,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
}
|
||||
|
||||
public String getServerModName() {
|
||||
|
@ -19,5 +19,5 @@ index 2079772..f42b95c 100644
|
|||
|
||||
public CrashReport b(CrashReport crashreport) {
|
||||
--
|
||||
2.5.1
|
||||
2.5.2
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ceed400928a2e43bd8b6062930645e20188d3040 Mon Sep 17 00:00:00 2001
|
||||
From d345901e9cf60cd5116d942943554f6b28217eef Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 8 Mar 2015 03:47:32 -0500
|
||||
Subject: [PATCH] Further improve server tick loop
|
||||
|
@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
|
|||
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index f42b95c..76ba101 100644
|
||||
index 9fc2cfa..06ae3fc 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -111,17 +111,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
|
@ -34,7 +34,7 @@ index f42b95c..76ba101 100644
|
|||
|
||||
public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
|
||||
io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
|
||||
@@ -512,12 +506,54 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
@@ -513,12 +507,54 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
this.isRunning = false;
|
||||
}
|
||||
|
||||
|
@ -94,7 +94,7 @@ index f42b95c..76ba101 100644
|
|||
|
||||
public void run() {
|
||||
try {
|
||||
@@ -530,26 +566,47 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
@@ -531,26 +567,47 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
this.a(this.r);
|
||||
|
||||
// Spigot start
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a71e327bd3f756762f61d7a45ce072ecd55d9325 Mon Sep 17 00:00:00 2001
|
||||
From 65eca689e3eba010eedb77394c062d08c40e49f9 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Fri, 17 Apr 2015 02:26:14 -0700
|
||||
Subject: [PATCH] Add FallingBlock source location API
|
||||
|
@ -37,7 +37,7 @@ index 29f8554..1d952b8 100644
|
|||
this.a(entityfallingblock);
|
||||
world.addEntity(entityfallingblock);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
index 5931e1d..44219cd 100644
|
||||
index 86556cd..aeade54 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
@@ -16,13 +16,22 @@ public class EntityFallingBlock extends Entity {
|
||||
|
@ -125,12 +125,12 @@ index 05b88fd..4402d57 100644
|
|||
if (Snowball.class.isAssignableFrom(clazz)) {
|
||||
entity = new EntitySnowball(world, x, y, z);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
|
||||
index 788f26b..f2dfedd 100644
|
||||
index 75eed48..eedb66f 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
|
||||
@@ -47,4 +47,11 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
|
||||
public void setDropItem(boolean drop) {
|
||||
getHandle().dropItem = drop;
|
||||
@@ -57,4 +57,11 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
|
||||
public void setHurtEntities(boolean hurtEntities) {
|
||||
getHandle().hurtEntities = hurtEntities;
|
||||
}
|
||||
+
|
||||
+ // PaperSpigot start - Add FallingBlock source location API
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 27b05483225a91b9ccdb0504343cb3196d1b3ba4 Mon Sep 17 00:00:00 2001
|
||||
From 72dad786d96891b88c7f89796c4d394a5d4bd319 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Tue, 16 Jun 2015 05:52:58 -0700
|
||||
Subject: [PATCH] Optimize explosions
|
||||
|
@ -110,10 +110,10 @@ index 0e8af2e..f6067ce 100644
|
|||
+ // PaperSpigot end
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 76ba101..c9a2ed7 100644
|
||||
index 06ae3fc..eac71e8 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -860,6 +860,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
@@ -861,6 +861,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||||
worldserver.timings.tracker.stopTiming(); // Spigot
|
||||
this.methodProfiler.b();
|
||||
this.methodProfiler.b();
|
||||
|
|
Loading…
Reference in a new issue