Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/raid/PersistentRaid.java
+++ b/net/minecraft/world/entity/raid/PersistentRaid.java
@@ -110,19 +110,33 @@
@@ -109,19 +109,33 @@
boolean flag = false;
if (!raid.isStarted()) {
@@ -18,7 +18,7 @@
+ // CraftBukkit end
} else {
entityplayer.removeEffect(MobEffects.BAD_OMEN);
entityplayer.connection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) 43));
entityplayer.connection.send(new PacketPlayOutEntityStatus(entityplayer, (byte) 43));
}
if (flag) {
@@ -32,6 +32,6 @@
+ this.raidMap.put(raid.getId(), raid);
+ }
+ // CraftBukkit end
raid.a((EntityHuman) entityplayer);
entityplayer.connection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) 43));
if (!raid.c()) {
raid.absorbBadOmen(entityplayer);
entityplayer.connection.send(new PacketPlayOutEntityStatus(entityplayer, (byte) 43));
if (!raid.hasFirstWaveSpawned()) {