Skip to content

Commit 7edaeb8

Browse files
froobynoobyfroobynooby
committed
Update upstream
1 parent 719d756 commit 7edaeb8

7 files changed

+32
-32
lines changed

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=com.froobworld.nabulus
22
version=1.20.4-R0.1-SNAPSHOT
33

44
mcVersion=1.20.4
5-
paperRef=fb16f9c80feb9ddacd94b4b6b99d6ad903bcdf9a
5+
paperRef=9d1221590f971c24f0f1643dc910274ba3369f2e
66

77
org.gradle.caching=true
88
org.gradle.parallel=true

‎patches/server/0001-Nabulus-branding.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Nabulus branding
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 0dab873b52e718ffb83c655b6467abe53c8fdb1d..3d682f71ff774cef605362837e2c615950300f57 100644
8+
index ab924caac3a84d14532adb3b96a6394cfea542f7..ac189d2edcea520423e5cbc1ea88eb4d5bafde07 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -17,7 +17,7 @@ index 0dab873b52e718ffb83c655b6467abe53c8fdb1d..3d682f71ff774cef605362837e2c6159
1717
// Pufferfish start
1818
implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
1919
exclude("io.papermc.paper", "paper-api")
20-
@@ -90,7 +90,7 @@ tasks.jar {
20+
@@ -91,7 +91,7 @@ tasks.jar {
2121
attributes(
2222
"Main-Class" to "org.bukkit.craftbukkit.Main",
2323
"Implementation-Title" to "CraftBukkit",
@@ -27,10 +27,10 @@ index 0dab873b52e718ffb83c655b6467abe53c8fdb1d..3d682f71ff774cef605362837e2c6159
2727
"Specification-Title" to "Bukkit",
2828
"Specification-Version" to project.version,
2929
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
30-
index d1c21d36de331905aedb08b0a8d4fbf97e100a13..76396c3b3ea756f344cf5cdb3cbd8392cc0b029e 100644
30+
index 60dad77b824c9b6a45e3a3960eb9d995583f1d28..7a00a26a61821b53cfa3316bc9ac445e7bc45de7 100644
3131
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
3232
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
33-
@@ -1862,7 +1862,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
33+
@@ -1872,7 +1872,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
3434

3535
@DontObfuscate
3636
public String getServerModName() {
@@ -40,7 +40,7 @@ index d1c21d36de331905aedb08b0a8d4fbf97e100a13..76396c3b3ea756f344cf5cdb3cbd8392
4040

4141
public SystemReport fillSystemReport(SystemReport details) {
4242
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
43-
index 9f5a6398a7dca841570a895054cee969dc96bca4..5b7d11206320fb99cb4924cacb18b5210bc28dc6 100644
43+
index 18bfe2fb7efad66f5fae07a30593d640c597bf77..57bc460e9908ea6d701db46cd6597578899663a6 100644
4444
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
4545
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
4646
@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper

‎patches/server/0002-Separate-creative-levels.patch

+10-10
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ index 58591bf2f63b9c5e97d9ce4188dff3366968a178..86887f5be0281facd85c48fab9873cac
5454
this.setShoulderEntityRight(oldPlayer.getShoulderEntityRight());
5555
this.setLastDeathLocation(oldPlayer.getLastDeathLocation());
5656
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
57-
index 91feb12732564c90656da487664dbc12e55397fc..82fd3a5d4a93880f9895eb0f3b4fdb33df8fdcf9 100644
57+
index 1e5f709115007ff19901c0a6c3cf884d9e4d3a6c..51bb5bb62c671eaf2f520c7258ca1cce36834e3b 100644
5858
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
5959
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
60-
@@ -843,8 +843,15 @@ public abstract class PlayerList {
60+
@@ -844,8 +844,15 @@ public abstract class PlayerList {
6161
entityplayer.wonGame = false;
6262
// CraftBukkit end
6363

@@ -75,10 +75,10 @@ index 91feb12732564c90656da487664dbc12e55397fc..82fd3a5d4a93880f9895eb0f3b4fdb33
7575
entityplayer1.setMainArm(entityplayer.getMainArm());
7676
Iterator iterator = entityplayer.getTags().iterator();
7777
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
78-
index 0f2af6968f6bb47f5ef7e3f63cbfdc2f6df53999..2b474bf3d2c5afd9e1ef6f5922f35b04fe711b39 100644
78+
index 5c5c8fbd562b46f8699be97353447eaab36c007a..c19a8359289d4ae3ea505ba978914b152b64342c 100644
7979
--- a/src/main/java/net/minecraft/world/entity/Entity.java
8080
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
81-
@@ -3644,6 +3644,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
81+
@@ -3660,6 +3660,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
8282
}
8383
// Paper end - Fix item duplication and teleport issues
8484
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -90,7 +90,7 @@ index 0f2af6968f6bb47f5ef7e3f63cbfdc2f6df53999..2b474bf3d2c5afd9e1ef6f5922f35b04
9090
this.level().getProfiler().push("changeDimension");
9191
// CraftBukkit start
9292
// this.unRide();
93-
@@ -3738,6 +3743,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
93+
@@ -3754,6 +3759,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
9494
if (destination == null) {
9595
return null;
9696
}
@@ -103,10 +103,10 @@ index 0f2af6968f6bb47f5ef7e3f63cbfdc2f6df53999..2b474bf3d2c5afd9e1ef6f5922f35b04
103103
boolean flag1 = destination.getTypeKey() == LevelStem.END; // targetIsEnd
104104
// CraftBukkit end
105105
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
106-
index 5ca1f834f311a87323ced2578535e66efa14e47f..f7b88c3215635e60d1448bb6cf57410148bd088e 100644
106+
index 567704f61034363e48ef2a5b5566ebdc91682297..badeaf695cfd617fc489c7ecb10e0c289f103b90 100644
107107
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
108108
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
109-
@@ -187,6 +187,40 @@ public abstract class Player extends LivingEntity {
109+
@@ -188,6 +188,40 @@ public abstract class Player extends LivingEntity {
110110
public boolean fauxSleeping;
111111
public int oldLevel = -1;
112112

@@ -147,15 +147,15 @@ index 5ca1f834f311a87323ced2578535e66efa14e47f..f7b88c3215635e60d1448bb6cf574101
147147
@Override
148148
public CraftHumanEntity getBukkitEntity() {
149149
return (CraftHumanEntity) super.getBukkitEntity();
150-
@@ -200,6 +234,7 @@ public abstract class Player extends LivingEntity {
150+
@@ -201,6 +235,7 @@ public abstract class Player extends LivingEntity {
151151
this.lastDeathLocation = Optional.empty();
152152
this.setUUID(gameProfile.getId());
153153
this.gameProfile = gameProfile;
154154
+ this.chooseInventory(); // Nabulus
155155
this.inventoryMenu = new InventoryMenu(this.inventory, !world.isClientSide, this);
156156
this.containerMenu = this.inventoryMenu;
157157
this.moveTo((double) pos.getX() + 0.5D, (double) (pos.getY() + 1), (double) pos.getZ() + 0.5D, yaw, 0.0F);
158-
@@ -862,6 +897,15 @@ public abstract class Player extends LivingEntity {
158+
@@ -863,6 +898,15 @@ public abstract class Player extends LivingEntity {
159159

160160
this.inventory.load(nbttaglist);
161161
this.inventory.selected = nbt.getInt("SelectedItemSlot");
@@ -171,7 +171,7 @@ index 5ca1f834f311a87323ced2578535e66efa14e47f..f7b88c3215635e60d1448bb6cf574101
171171
this.sleepCounter = nbt.getShort("SleepTimer");
172172
this.experienceProgress = nbt.getFloat("XpP");
173173
this.experienceLevel = nbt.getInt("XpLevel");
174-
@@ -901,8 +945,12 @@ public abstract class Player extends LivingEntity {
174+
@@ -902,8 +946,12 @@ public abstract class Player extends LivingEntity {
175175
public void addAdditionalSaveData(CompoundTag nbt) {
176176
super.addAdditionalSaveData(nbt);
177177
NbtUtils.addCurrentDataVersion(nbt);

‎patches/server/0003-Show-hidden-players-in-playerlist-and-tab-suggestion.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index 73180c617945610e11b777733655f9e2c4c1dd0c..aec6ec9bc92dc784ea1c2907b051a3f9
1818
List<ServerPlayer> list = players;
1919
// CraftBukkit end
2020
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
21-
index 82fd3a5d4a93880f9895eb0f3b4fdb33df8fdcf9..5d9ac68d44ae7ad7dfcdd8b29b97fe7af29369b2 100644
21+
index 51bb5bb62c671eaf2f520c7258ca1cce36834e3b..78a2cd8163f727de0081f0b9dfc152e185a5324c 100644
2222
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
2323
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
24-
@@ -362,7 +362,7 @@ public abstract class PlayerList {
24+
@@ -363,7 +363,7 @@ public abstract class PlayerList {
2525
for (int i = 0; i < this.players.size(); ++i) {
2626
ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
2727

@@ -30,7 +30,7 @@ index 82fd3a5d4a93880f9895eb0f3b4fdb33df8fdcf9..5d9ac68d44ae7ad7dfcdd8b29b97fe7a
3030
// Paper start - Add Listing API for Player
3131
if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
3232
// Paper end - Add Listing API for Player
33-
@@ -375,7 +375,7 @@ public abstract class PlayerList {
33+
@@ -376,7 +376,7 @@ public abstract class PlayerList {
3434
}
3535

3636
if (entityplayer1 == player || !bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) { // Paper - Use single player info update packet on join; Don't include joining player
@@ -39,15 +39,15 @@ index 82fd3a5d4a93880f9895eb0f3b4fdb33df8fdcf9..5d9ac68d44ae7ad7dfcdd8b29b97fe7a
3939
}
4040

4141
onlinePlayers.add(entityplayer1); // Paper - Use single player info update packet on join
42-
@@ -681,6 +681,7 @@ public abstract class PlayerList {
42+
@@ -682,6 +682,7 @@ public abstract class PlayerList {
4343
if (entityplayer2.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
4444
entityplayer2.connection.send(packet);
4545
} else {
4646
+ entityplayer2.connection.send(packet); // Nabulus
4747
entityplayer2.getBukkitEntity().onEntityRemove(entityplayer);
4848
}
4949
}
50-
@@ -1030,7 +1031,7 @@ public abstract class PlayerList {
50+
@@ -1031,7 +1032,7 @@ public abstract class PlayerList {
5151
target.connection.send(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY), this.players.stream().filter(new Predicate<ServerPlayer>() {
5252
@Override
5353
public boolean test(ServerPlayer input) {
@@ -57,10 +57,10 @@ index 82fd3a5d4a93880f9895eb0f3b4fdb33df8fdcf9..5d9ac68d44ae7ad7dfcdd8b29b97fe7a
5757
}).collect(Collectors.toList())));
5858
}
5959
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
60-
index 5b7d11206320fb99cb4924cacb18b5210bc28dc6..95b6aa9738f29b4f99cf0fdf23a318ce2d4676bd 100644
60+
index 57bc460e9908ea6d701db46cd6597578899663a6..a7f650928d539e3247ec05051d9b8b24c5972573 100644
6161
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
6262
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
63-
@@ -2550,7 +2550,7 @@ public final class CraftServer implements Server {
63+
@@ -2565,7 +2565,7 @@ public final class CraftServer implements Server {
6464
PlayerChatTabCompleteEvent event = new PlayerChatTabCompleteEvent(player, message, completions);
6565
String token = event.getLastToken();
6666
for (Player p : this.getOnlinePlayers()) {
@@ -70,7 +70,7 @@ index 5b7d11206320fb99cb4924cacb18b5210bc28dc6..95b6aa9738f29b4f99cf0fdf23a318ce
7070
}
7171
}
7272
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
73-
index 206520f6f20b2e48b1eefdd4edb26510b88e4c92..29e6f1f8c98448c922a713cf7b2d3c0bd4828f44 100644
73+
index 616d2e479d91673695ade0db151a0099b568904f..12c04ca1307ed63046130f46a31f9e2698ec3949 100644
7474
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
7575
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
7676
@@ -463,7 +463,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

‎patches/server/0005-Add-silent-chest-flag-to-players.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add silent chest flag to players
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
8-
index f7b88c3215635e60d1448bb6cf57410148bd088e..df163093bdc3c7da9cd8ba2159b06b051bc99302 100644
8+
index badeaf695cfd617fc489c7ecb10e0c289f103b90..7cce12ec244af47970a3ede7e8384dc83114d636 100644
99
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
1010
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
11-
@@ -188,6 +188,7 @@ public abstract class Player extends LivingEntity {
11+
@@ -189,6 +189,7 @@ public abstract class Player extends LivingEntity {
1212
public int oldLevel = -1;
1313

1414
// Nabulus start

‎patches/server/0009-Don-t-show-smoke-for-silent-fireworks.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't show smoke for silent fireworks
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
8-
index 7005b3a26e9b5d79064981a4a41bee21b65a9fc3..21fdd9e3db1ed71414bd30e54b75b41bafe51786 100644
8+
index 5b3b59057b962438c6f4fc8a1507342865b3bc11..9b70689b75514dca0c802a3dee8c16f8f24afa43 100644
99
--- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
11-
@@ -170,7 +170,7 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
11+
@@ -173,7 +173,7 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
1212
}
1313

1414
++this.life;

‎patches/server/0010-Allow-players-to-hide-wither-boss-bar.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow players to hide wither boss bar
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
8-
index ea8883b0661e894a466eca24bfc247ac37f40a81..26f7cb0178f05163d14ef325b04e07c248d5a6d2 100644
8+
index de2471cfa96a23944f229f33ffdff88b6b7756e4..dd3c894d766b88ac288cc4ea35c21efe6eb4f2d7 100644
99
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
1010
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
11-
@@ -89,6 +89,21 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
11+
@@ -90,6 +90,21 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
1212

1313
public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; }
1414
// Paper end
@@ -30,15 +30,15 @@ index ea8883b0661e894a466eca24bfc247ac37f40a81..26f7cb0178f05163d14ef325b04e07c2
3030

3131
public WitherBoss(EntityType<? extends WitherBoss> type, Level world) {
3232
super(type, world);
33-
@@ -147,6 +162,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
33+
@@ -148,6 +163,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
3434
@Override
3535
public void setCustomName(@Nullable Component name) {
3636
super.setCustomName(name);
3737
+ updateBossBar(); // Nabulus
3838
this.bossEvent.setName(this.getDisplayName());
3939
}
4040

41-
@@ -421,7 +437,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
41+
@@ -422,7 +438,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
4242
@Override
4343
public void startSeenByPlayer(ServerPlayer player) {
4444
super.startSeenByPlayer(player);

0 commit comments

Comments
 (0)