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

> not even using java8 time API 

Gotta get this rocketship up to speed I guess...
This commit is contained in:
Zach Brown 2018-03-31 23:30:19 -04:00
parent 5bad6ba5b6
commit 594b647cce
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0178-Optimize-ItemStack.isEmpty.patch
View File

@ -1,4 +1,4 @@
From 6118660672d8a271d621a7d709bb04525aef2655 Mon Sep 17 00:00:00 2001 From 928399a231691ca924638613a15cbebaa634a4af Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 21 Dec 2016 03:48:29 -0500 Date: Wed, 21 Dec 2016 03:48:29 -0500
Subject: [PATCH] Optimize ItemStack.isEmpty() Subject: [PATCH] Optimize ItemStack.isEmpty()
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
Remove hashMap lookup every check, simplify code to remove ternary Remove hashMap lookup every check, simplify code to remove ternary
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index a8f7ff98f..9465f4c16 100644 index a8f7ff98..9465f4c1 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java --- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -143,9 +143,15 @@ public final class ItemStack { @@ -143,9 +143,15 @@ public final class ItemStack {
@ -27,5 +27,5 @@ index a8f7ff98f..9465f4c16 100644
public static void a(DataConverterManager dataconvertermanager) { public static void a(DataConverterManager dataconvertermanager) {
dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity())); dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
-- --
2.16.1 2.16.2

8
Spigot-Server-Patches/0179-Add-API-methods-to-control-if-armour-stands-can-move.patch
View File

@ -1,11 +1,11 @@
From ae7502f7d2f8e7218adbae9d3db0fc16e23e56f5 Mon Sep 17 00:00:00 2001 From 5dfd9332ae1e106d0216583a14e3e2c0302fb10e Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:47:25 -0600 Date: Wed, 21 Dec 2016 11:47:25 -0600
Subject: [PATCH] Add API methods to control if armour stands can move Subject: [PATCH] Add API methods to control if armour stands can move
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index c9054fc91..ee3d37a71 100644 index c9054fc9..ee3d37a7 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving { @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@ -31,7 +31,7 @@ index c9054fc91..ee3d37a71 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 2b66a08ad..8a06cb165 100644 index 2b66a08a..8a06cb16 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@ -50,5 +50,5 @@ index 2b66a08ad..8a06cb165 100644
+ } + }
} }
-- --
2.16.1 2.16.2

8
Spigot-Server-Patches/0285-Easter-and-April-Fools-fall-on-the-same-day.patch
View File

@ -1,4 +1,4 @@
From 3fd22e06ffb4a1530ad73701c571c190b7d2dc7b Mon Sep 17 00:00:00 2001 From f0db6278e491b4a845bf8199c36b1dc5ce1bf0aa Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 31 Mar 2018 22:49:05 -0400 Date: Sat, 31 Mar 2018 22:49:05 -0400
Subject: [PATCH] Easter and April Fools fall on the same day Subject: [PATCH] Easter and April Fools fall on the same day
@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit
¯\_(ツ)_/¯ ¯\_(ツ)_/¯
diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
index 08131afc..7366c4b4 100644 index 08131afc..82c37b87 100644
--- a/src/main/java/net/minecraft/server/EntityEgg.java --- a/src/main/java/net/minecraft/server/EntityEgg.java
+++ b/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java
@@ -45,6 +45,13 @@ public class EntityEgg extends EntityProjectile { @@ -45,6 +45,13 @@ public class EntityEgg extends EntityProjectile {
@ -17,8 +17,8 @@ index 08131afc..7366c4b4 100644
EntityType hatchingType = EntityType.CHICKEN; EntityType hatchingType = EntityType.CHICKEN;
+ // Paper start - 2018-04-01 is easter and April fools day... come on now how can we not + // Paper start - 2018-04-01 is easter and April fools day... come on now how can we not
+ java.util.Date rightNow = java.util.Calendar.getInstance().getTime(); + java.time.LocalDate today = java.time.LocalDate.now();
+ if (rightNow.getDate() == 1 && rightNow.getMonth() == 3 && rightNow.getYear() == 118) { + if (today.getDayOfMonth() == 1 && today.getMonth() == java.time.Month.APRIL && today.getYear() == 2018) {
+ hatchingType = EntityType.RABBIT; + hatchingType = EntityType.RABBIT;
+ } + }
+ // Paper end + // Paper end