Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
220bc594 #486: Add method to get player's attack cooldown
21853d39 SPIGOT-5681: Increase max plugin channel size
5b972adc Improve build process
b55e58d9 Note which custom generator is missing required method

CraftBukkit Changes:
893ad93b #650: Add method to get player's attack cooldown
ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender.
e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much
94cb030f SPIGOT-5673: swingHand API does not show to self
b331a055 SPIGOT-5680: isChunkGenerated creates empty region files
e1335932 Improve build process
a8ec1d60 Add a couple of method null checks to CraftWorld
ce66f693 Misc checkstyle fixes
8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated

Spigot Changes:
2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border
ab8f6b5a Rebuild patches
e7dc2f53 Rebuild patches
This commit is contained in:
Aikar
2020-04-27 03:34:45 -04:00
parent c03260a280
commit 842e040c19
104 changed files with 746 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
View File

@@ -1,4 +1,4 @@
From 6f567dd6ea759b3af52c4ec8096ea256858ba361 Mon Sep 17 00:00:00 2001
From b22dd2c697e51dfe9dfc7e94eab83868025cc088 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 22 Jan 2017 18:07:56 -0500
Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
You can set this to 0 to disable collisions.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index f164844f..751551f1 100644
index f164844f33..751551f173 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -322,4 +322,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index f164844f..751551f1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1c8958d1..4f8e10b8 100644
index 3b02a65ba2..0d7dcc1463 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,10 +39,10 @@ index 1c8958d1..4f8e10b8 100644
// Spigot end
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2775afc3..74de19bb 100644
index 306435c1c6..639d113de3 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2623,8 +2623,11 @@ public abstract class EntityLiving extends Entity {
@@ -2626,8 +2626,11 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -56,5 +56,5 @@ index 2775afc3..74de19bb 100644
this.C(entity);
}
--
2.25.1.windows.1
2.26.2