mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08:00
Update upstream CB
This commit is contained in:
parent
ae17d2c28c
commit
e6a7d357ce
@ -1,4 +1,4 @@
|
|||||||
From b9ed456c56c03fd801daea418dc35ec4d8a0a2cb Mon Sep 17 00:00:00 2001
|
From d40440cebea4465e17477fd5e9fbbdc815a06c4a Mon Sep 17 00:00:00 2001
|
||||||
From: DoctorDark <doctordark11@gmail.com>
|
From: DoctorDark <doctordark11@gmail.com>
|
||||||
Date: Wed, 16 Mar 2016 02:21:39 -0500
|
Date: Wed, 16 Mar 2016 02:21:39 -0500
|
||||||
Subject: [PATCH] Configurable end credits
|
Subject: [PATCH] Configurable end credits
|
||||||
@ -20,7 +20,7 @@ index fd606ee14..c00fa83d5 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index b311903fb..378057e85 100644
|
index 4b9e83161..7c8c61ee8 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -513,6 +513,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -513,6 +513,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
@ -38,8 +38,8 @@ index b311903fb..378057e85 100644
|
|||||||
+
|
+
|
||||||
@Nullable
|
@Nullable
|
||||||
public Entity c(int i) {
|
public Entity c(int i) {
|
||||||
// this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
|
if (this.isSleeping()) return this; // CraftBukkit - SPIGOT-3154
|
||||||
@@ -521,7 +530,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -522,7 +531,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
this.world.kill(this);
|
this.world.kill(this);
|
||||||
if (!this.viewingCredits) {
|
if (!this.viewingCredits) {
|
||||||
this.viewingCredits = true;
|
this.viewingCredits = true;
|
||||||
@ -52,5 +52,5 @@ index b311903fb..378057e85 100644
|
|||||||
} else {
|
} else {
|
||||||
this.b((Statistic) AchievementList.D);
|
this.b((Statistic) AchievementList.D);
|
||||||
--
|
--
|
||||||
2.12.0.windows.1
|
2.12.1.windows.1
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From 26e1ed0356b858d55a7bbad90ab7e8e0f835b8ab Mon Sep 17 00:00:00 2001
|
From 7c5c9f54197be368f4de6333591de92a2c03e239 Mon Sep 17 00:00:00 2001
|
||||||
From: Isaac Moore <rmsy@me.com>
|
From: Isaac Moore <rmsy@me.com>
|
||||||
Date: Tue, 19 Apr 2016 14:09:31 -0500
|
Date: Tue, 19 Apr 2016 14:09:31 -0500
|
||||||
Subject: [PATCH] Implement PlayerLocaleChangeEvent
|
Subject: [PATCH] Implement PlayerLocaleChangeEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index d0e1de48a..80b313b47 100644
|
index 7ec504730..cfdff768f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand;
|
@@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand;
|
||||||
@ -17,7 +17,7 @@ index d0e1de48a..80b313b47 100644
|
|||||||
public PlayerConnection playerConnection;
|
public PlayerConnection playerConnection;
|
||||||
public final MinecraftServer server;
|
public final MinecraftServer server;
|
||||||
public final PlayerInteractManager playerInteractManager;
|
public final PlayerInteractManager playerInteractManager;
|
||||||
@@ -1092,7 +1092,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -1093,7 +1093,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
this.server.server.getPluginManager().callEvent(event);
|
this.server.server.getPluginManager().callEvent(event);
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
@ -50,5 +50,5 @@ index a74d6c768..a2fb7d2be 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.12.0.windows.1
|
2.12.1.windows.1
|
||||||
|
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
From 8fa8ea1454de05471873e81d8a6c806720b143f0 Mon Sep 17 00:00:00 2001
|
From 88f7bde20a7c6a5478b3a64d5761543945318e41 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Sun, 31 Jul 2016 16:33:03 -0500
|
Date: Sun, 31 Jul 2016 16:33:03 -0500
|
||||||
Subject: [PATCH] Re-track players that dismount from other players
|
Subject: [PATCH] Re-track players that dismount from other players
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index 80b313b47..93c4babd9 100644
|
index cfdff768f..5753f5b97 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -650,6 +650,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -651,6 +651,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
if (entity1 != entity && this.playerConnection != null) {
|
if (entity1 != entity && this.playerConnection != null) {
|
||||||
this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
|
this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
|
||||||
}
|
}
|
||||||
@ -23,5 +23,5 @@ index 80b313b47..93c4babd9 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.12.0.windows.1
|
2.12.1.windows.1
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From 812cbc220dbd54319a06cb73cb47b38a4871221e Mon Sep 17 00:00:00 2001
|
From 4b6c877be1c3f82fe7502f8be28367b47de0ef6d Mon Sep 17 00:00:00 2001
|
||||||
From: Alfie Cleveland <alfeh@me.com>
|
From: Alfie Cleveland <alfeh@me.com>
|
||||||
Date: Fri, 25 Nov 2016 13:22:40 +0000
|
Date: Fri, 25 Nov 2016 13:22:40 +0000
|
||||||
Subject: [PATCH] Optimise removeQueue
|
Subject: [PATCH] Optimise removeQueue
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index 4da83a1bf..a7a71242e 100644
|
index 0d73fc4cf..ea140f715 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
|
@@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
|
||||||
@ -46,7 +46,7 @@ index 4da83a1bf..a7a71242e 100644
|
|||||||
|
|
||||||
this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
|
this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
|
||||||
}
|
}
|
||||||
@@ -991,7 +1000,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -992,7 +1001,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
this.lastSentExp = -1;
|
this.lastSentExp = -1;
|
||||||
this.lastHealthSent = -1.0F;
|
this.lastHealthSent = -1.0F;
|
||||||
this.cc = -1;
|
this.cc = -1;
|
||||||
@ -61,5 +61,5 @@ index 4da83a1bf..a7a71242e 100644
|
|||||||
|
|
||||||
protected void a(MobEffect mobeffect) {
|
protected void a(MobEffect mobeffect) {
|
||||||
--
|
--
|
||||||
2.12.0.windows.1
|
2.12.1.windows.1
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 2a7b019048cb66dd8fc16d2bdc6eda07a8acfaef Mon Sep 17 00:00:00 2001
|
From 45e06ece3de8a6cbb446c94ca66b8347324ea0ab Mon Sep 17 00:00:00 2001
|
||||||
From: Alfie Cleveland <alfeh@me.com>
|
From: Alfie Cleveland <alfeh@me.com>
|
||||||
Date: Tue, 27 Dec 2016 01:57:57 +0000
|
Date: Tue, 27 Dec 2016 01:57:57 +0000
|
||||||
Subject: [PATCH] Properly fix item duplication bug
|
Subject: [PATCH] Properly fix item duplication bug
|
||||||
@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
|
|||||||
Credit to prplz for figuring out the real issue
|
Credit to prplz for figuring out the real issue
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index a7a71242e..3147f4a08 100644
|
index ea140f715..7bc7991eb 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -1333,7 +1333,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -1334,7 +1334,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean isFrozen() {
|
protected boolean isFrozen() {
|
||||||
@ -31,5 +31,5 @@ index 9214c5594..964de593b 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.12.0.windows.1
|
2.12.1.windows.1
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit d09304e5db889f233abc5e57416119d131af0830
|
Subproject commit 7dd77d7340d2bcc1ebab5ab0b0b60e8fb3e0add7
|
Loading…
Reference in New Issue
Block a user