forked from PaperMC/Paper
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
should actually fix this in PE later.... bleh
- Loading branch information
1 parent
9fad1ed
commit ee19733
Showing
16 changed files
with
23 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From d7db57b339c57a92499d3cf10f4d6f55ad3fc104 Mon Sep 17 00:00:00 2001 | ||
From ff872a70399b89fe85a6332be178d8813a399221 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Sat, 2 Mar 2019 16:12:35 -0500 | ||
Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency | ||
|
@@ -62,5 +62,5 @@ index 135d25abd..408c382d2 100644 | |
|
||
public List<EntityPlayer> b(String s) { | ||
-- | ||
2.21.0 | ||
2.17.2 (Apple Git-113) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 727fe100a19532c038f152a5dd279eb293a62e2a Mon Sep 17 00:00:00 2001 | ||
From 67b0a138352322ac00206d7945281cc4edca4c0d Mon Sep 17 00:00:00 2001 | ||
From: Zach Brown <[email protected]> | ||
Date: Mon, 4 Mar 2019 02:23:28 -0500 | ||
Subject: [PATCH] Set Zombie last tick at start of drowning process | ||
|
@@ -18,5 +18,5 @@ index 24bc3e0f0..bf2bed002 100644 | |
} else { | ||
this.bI = -1; | ||
-- | ||
2.21.0 | ||
2.17.2 (Apple Git-113) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From b47b695772ea905a1556f6db24b198709000ab74 Mon Sep 17 00:00:00 2001 | ||
From b474762cd89ecd9002e788993f8423e88dd7041b Mon Sep 17 00:00:00 2001 | ||
From: Mark Vainomaa <[email protected]> | ||
Date: Wed, 13 Mar 2019 20:08:09 +0200 | ||
Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled | ||
|
@@ -17,5 +17,5 @@ index 408c382d2..b1630137e 100644 | |
} | ||
|
||
-- | ||
2.21.0 | ||
2.17.2 (Apple Git-113) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From eafb2cc37ab642330de42277e7e84bcb504988ea Mon Sep 17 00:00:00 2001 | ||
From 8eaa0593e30175cc9399129dd16a17630268a8a8 Mon Sep 17 00:00:00 2001 | ||
From: kashike <[email protected]> | ||
Date: Wed, 20 Mar 2019 21:19:29 -0700 | ||
Subject: [PATCH] Use proper max length when serialising BungeeCord text | ||
|
@@ -31,5 +31,5 @@ index eba6aadad..3a332e980 100644 | |
// Paper end | ||
} else { | ||
-- | ||
2.21.0 | ||
2.17.2 (Apple Git-113) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 1dbf386fc08f6efe1e5dcdea5c9df5bf427cd8b5 Mon Sep 17 00:00:00 2001 | ||
From 44eaaff30d1e8a4dce01570259f5bea560b28288 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Sun, 24 Mar 2019 00:24:52 -0400 | ||
Subject: [PATCH] Entity#getEntitySpawnReason | ||
|
@@ -98,7 +98,7 @@ index b1630137e..df416e3b5 100644 | |
if (entity != null) { | ||
UUID uuid = nbttagcompound1.a("Attach"); | ||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java | ||
index 5b4bce464..2d436feab 100644 | ||
index 0624848cc..9faed9303 100644 | ||
--- a/src/main/java/net/minecraft/server/World.java | ||
+++ b/src/main/java/net/minecraft/server/World.java | ||
@@ -1084,6 +1084,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc | ||
|
@@ -124,5 +124,5 @@ index d4a8fb16b..51f70c5ee 100644 | |
// Paper end | ||
} | ||
-- | ||
2.21.0 | ||
2.17.2 (Apple Git-113) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 9e85ab2027dac98fc5f8252b955be863a7cb64f3 Mon Sep 17 00:00:00 2001 | ||
From 3633580bb504a00b405faa614425d98055356ffd Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Sun, 24 Mar 2019 01:01:32 -0400 | ||
Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob | ||
|
@@ -62,5 +62,5 @@ index a10a5bc13..a5a63f800 100644 | |
if (entity instanceof EntityInsentient) { | ||
EntityInsentient entityinsentient = (EntityInsentient) entity; | ||
-- | ||
2.21.0 | ||
2.17.2 (Apple Git-113) | ||
|
2 changes: 1 addition & 1 deletion
2
...hes/0425-stair-collision-for-pe-fix.patch → ...hes/0424-stair-collision-for-pe-fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 1f98d7be1cc5094688eee20a668ac9287c425c83 Mon Sep 17 00:00:00 2001 | ||
From b505fc0932153cb03992fde84400479a68f89108 Mon Sep 17 00:00:00 2001 | ||
From: Colin Godsey <[email protected]> | ||
Date: Sat, 9 Mar 2019 18:31:12 -0700 | ||
Subject: [PATCH] stair collision for pe fix | ||
|
2 changes: 1 addition & 1 deletion
2
...ty-Metadata-for-all-tracked-players.patch → ...ty-Metadata-for-all-tracked-players.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 52b525cd80df1bfe831eafaab9a47b5d9865db25 Mon Sep 17 00:00:00 2001 | ||
From bc3d7448b8460eb67f60126e88f939a742ab128d Mon Sep 17 00:00:00 2001 | ||
From: AgentTroll <[email protected]> | ||
Date: Fri, 22 Mar 2019 22:24:03 -0700 | ||
Subject: [PATCH] Update entity Metadata for all tracked players | ||
|
2 changes: 1 addition & 1 deletion
2
...atches/0427-Fire-event-on-GS4-query.patch → ...atches/0426-Fire-event-on-GS4-query.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 1a9cdfab77c039d03c6408af1f8dbf80137c51f0 Mon Sep 17 00:00:00 2001 | ||
From c87a9f0eda2f35a98b50fb3c1243179ef42aa8f0 Mon Sep 17 00:00:00 2001 | ||
From: Mark Vainomaa <[email protected]> | ||
Date: Sun, 17 Mar 2019 21:46:56 +0200 | ||
Subject: [PATCH] Fire event on GS4 query | ||
|
2 changes: 1 addition & 1 deletion
2
...28-Implement-PlayerPostRespawnEvent.patch → ...27-Implement-PlayerPostRespawnEvent.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6b60e46af00d6167f9997c79251d9cfca0531d47 Mon Sep 17 00:00:00 2001 | ||
From 89ec9e99d7f677aa51364377853363ba623b803b Mon Sep 17 00:00:00 2001 | ||
From: MisterVector <[email protected]> | ||
Date: Fri, 26 Oct 2018 21:31:00 -0700 | ||
Subject: [PATCH] Implement PlayerPostRespawnEvent | ||
|
2 changes: 1 addition & 1 deletion
2
...for-pickupDelay-breaks-picking-up-i.patch → ...for-pickupDelay-breaks-picking-up-i.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a0aa56bfad32c93d3991e6061560d3bbbba28330 Mon Sep 17 00:00:00 2001 | ||
From 978073acb6a45deb929498311d0d3850aad3db45 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Sun, 24 Mar 2019 18:09:20 -0400 | ||
Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items | ||
|
2 changes: 1 addition & 1 deletion
2
...ty-trackers-for-worlds-without-play.patch → ...ty-trackers-for-worlds-without-play.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 744ce903dd30d03ef7cdd923fcc76ee1ffe84f21 Mon Sep 17 00:00:00 2001 | ||
From 2b72bfa5e93e8ce60a32cec1a3e6340d1d651419 Mon Sep 17 00:00:00 2001 | ||
From: Shane Freeder <[email protected]> | ||
Date: Sun, 24 Mar 2019 18:52:31 +0000 | ||
Subject: [PATCH] Don't update entity trackers for worlds without players | ||
|
2 changes: 1 addition & 1 deletion
2
...ver-Patches/0431-Server-Tick-Events.patch → ...ver-Patches/0430-Server-Tick-Events.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From d047c67f22e40afcdaf875f1d91837e330a87452 Mon Sep 17 00:00:00 2001 | ||
From b542d339101e46bedc3c9540fbde3087c799f0b2 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Wed, 27 Mar 2019 22:48:45 -0400 | ||
Subject: [PATCH] Server Tick Events | ||
|
2 changes: 1 addition & 1 deletion
2
...432-PlayerDeathEvent-getItemsToKeep.patch → ...431-PlayerDeathEvent-getItemsToKeep.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 2995c17d221931046dcb1cdeacb2548f09cc290e Mon Sep 17 00:00:00 2001 | ||
From 3344873c847e07579103406b34e1126fc8d63bf6 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Wed, 27 Mar 2019 23:01:33 -0400 | ||
Subject: [PATCH] PlayerDeathEvent#getItemsToKeep | ||
|
2 changes: 1 addition & 1 deletion
2
...433-alternate-mob-spawning-mechanic.patch → ...432-alternate-mob-spawning-mechanic.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 894bf241d27269d13e59c07a8db9c2565460a6d4 Mon Sep 17 00:00:00 2001 | ||
From 24c442de168c0fbbd16ea7f2a185c0580659fbd2 Mon Sep 17 00:00:00 2001 | ||
From: Colin Godsey <[email protected]> | ||
Date: Thu, 28 Mar 2019 19:48:49 -0600 | ||
Subject: [PATCH] alternate mob spawning mechanic | ||
|
2 changes: 1 addition & 1 deletion
2
...34-Optimize-Persistent-Data-Loading.patch → ...33-Optimize-Persistent-Data-Loading.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 19a20668ad62d55d73d146020f0e1c909c31ea39 Mon Sep 17 00:00:00 2001 | ||
From e477c300750f279844ad4bcb88edab7ac4177668 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Fri, 29 Mar 2019 01:25:11 -0400 | ||
Subject: [PATCH] Optimize Persistent Data Loading | ||
|