spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2016-07-29 17:37:58 +10:00
parent 078e2f8b3c
commit af8198d44a
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Bukkit-Patches/0002-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From da9451ee7f0f6cdc5c0c805007060a6e0f2ba90e Mon Sep 17 00:00:00 2001
From d371978625ce965680b73df60ae362c332de8261 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings
@ -78,16 +78,16 @@ index a02c28d..0ba9b1c 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 5b0f21e..f180da0 100644
index a026203..e2fc282 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -136,11 +136,15 @@ public class SimpleCommandMap implements CommandMap {
@@ -135,11 +135,15 @@ public class SimpleCommandMap implements CommandMap {
}
try {
+ target.timings.startTiming(); // Spigot
// Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
target.execute(sender, sentCommandLabel, Arrays_copyOfRange(args, 1, args.length));
target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
+ target.timings.stopTiming(); // Spigot
} catch (CommandException ex) {
+ target.timings.stopTiming(); // Spigot

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

@ -1,4 +1,4 @@
From c0869f7e51829775e79ea97c6326a98c9c3a33e6 Mon Sep 17 00:00:00 2001
From 76f036fe29ab89b3784d7e20e602122801c3ec3f 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,10 +25,10 @@ index 3c1f3f5..fc6488a 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 47a050e..0c49eb4 100644
index d0ed03b..e498dda 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1479,4 +1479,14 @@ public class CraftWorld implements World {
@@ -1468,4 +1468,14 @@ public class CraftWorld implements World {
cps.unload(chunk);
}
}

6
CraftBukkit-Patches/0052-Particle-API.patch
View file

@ -1,4 +1,4 @@
From a6b23d7f2fc7326a50cd2151bdd3f2deb70edc71 Mon Sep 17 00:00:00 2001
From 484f58dfc23777b024080e0803cda1715e717780 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 1672183..352ff3a 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index cbfc11c..d0cb125 100644
index 7af01e4..421c62d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -827,28 +827,18 @@ public class CraftWorld implements World {
@ -60,7 +60,7 @@ index cbfc11c..d0cb125 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1485,6 +1475,70 @@ public class CraftWorld implements World {
@@ -1474,6 +1464,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0076-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 707dc63aaea53ccbd00d92947fe483407878721e Mon Sep 17 00:00:00 2001
From a63ceffe00534bc1f29958412bedb5c64b7446cd Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -40,10 +40,10 @@ index 79f640a..f2691d9 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dn, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a9cffcd..397d7d2 100644
index 41c09e2..f5adee5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1544,6 +1544,22 @@ public class CraftWorld implements World {
@@ -1533,6 +1533,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}

6
CraftBukkit-Patches/0118-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View file

@ -1,4 +1,4 @@
From 80be57ff958eeeb3242293378277f9e821338430 Mon Sep 17 00:00:00 2001
From c4da16539007dc1d1863d7b34e99a690e417fc93 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@ -26,10 +26,10 @@ index a879f3f..149bd01 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 397d7d2..9a83975 100644
index f5adee5..6078242 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1122,6 +1122,12 @@ public class CraftWorld implements World {
@@ -1111,6 +1111,12 @@ public class CraftWorld implements World {
}
if (entity != null) {