spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix newlines in custom restart message

Browse source
This commit is contained in:
md_5 2024-06-22 21:49:32 +10:00
parent 1aabe506c6
commit cb8cf80cab
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
7 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0007-View-Distance.patch
View file

@ -1,4 +1,4 @@
From f10ae0e1de3c3f50344c6e9591a24172ab0f4b00 Mon Sep 17 00:00:00 2001
From ec8ca295e21f33a1f4c8ac1500c79fc1a4efa543 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -21,7 +21,7 @@ index f07e8247e3..f500d56f8e 100644
Objects.requireNonNull(this.entityManager);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c4aa378c2e..d579314e65 100644
index 2893affc38..9e6fc1658a 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -236,7 +236,8 @@ public abstract class PlayerList {
@ -34,7 +34,7 @@ index c4aa378c2e..d579314e65 100644
entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
playerconnection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
playerconnection.send(new PacketPlayOutAbilities(entityplayer.getAbilities()));
@@ -722,6 +723,8 @@ public abstract class PlayerList {
@@ -723,6 +724,8 @@ public abstract class PlayerList {
WorldData worlddata = worldserver1.getLevelData();
entityplayer1.connection.send(new PacketPlayOutRespawn(entityplayer1.createCommonSpawnInfo(worldserver1), (byte) i));

20
CraftBukkit-Patches/0008-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From fa0d13150f59fbecff9a3e18873475f256138ad4 Mon Sep 17 00:00:00 2001
From 652ba16335ea1b4f172f130e47c2d575c72aae8d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -360,7 +360,7 @@ index ecd5b91309..245afb6a6b 100644
private boolean isStateClimbable(IBlockData iblockdata) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index ac53bea157..980f3dce9a 100644
index 92df69c5c2..a307c29f31 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -158,6 +158,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -372,7 +372,7 @@ index ac53bea157..980f3dce9a 100644
public abstract class EntityLiving extends Entity implements Attackable {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -2942,6 +2944,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -2974,6 +2976,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@Override
public void tick() {
@ -380,7 +380,7 @@ index ac53bea157..980f3dce9a 100644
super.tick();
this.updatingUsingItem();
this.updateSwimAmount();
@@ -2983,7 +2986,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3015,7 +3018,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
if (!this.isRemoved()) {
@ -390,7 +390,7 @@ index ac53bea157..980f3dce9a 100644
}
double d0 = this.getX() - this.xo;
@@ -3074,6 +3079,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3106,6 +3111,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.refreshDimensions();
}
@ -398,7 +398,7 @@ index ac53bea157..980f3dce9a 100644
}
public void detectEquipmentUpdatesPublic() { // CraftBukkit
@@ -3289,6 +3295,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3321,6 +3327,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.setDeltaMovement(d0, d1, d2);
this.level().getProfiler().push("ai");
@ -406,7 +406,7 @@ index ac53bea157..980f3dce9a 100644
if (this.isImmobile()) {
this.jumping = false;
this.xxa = 0.0F;
@@ -3298,6 +3305,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3330,6 +3337,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.serverAiStep();
this.level().getProfiler().pop();
}
@ -414,7 +414,7 @@ index ac53bea157..980f3dce9a 100644
this.level().getProfiler().pop();
this.level().getProfiler().push("jump");
@@ -3337,6 +3345,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3369,6 +3377,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.resetFallDistance();
}
@ -422,7 +422,7 @@ index ac53bea157..980f3dce9a 100644
label104:
{
EntityLiving entityliving = this.getControllingPassenger();
@@ -3350,6 +3359,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3382,6 +3391,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.travel(vec3d1);
}
@ -430,7 +430,7 @@ index ac53bea157..980f3dce9a 100644
this.level().getProfiler().pop();
this.level().getProfiler().push("freezing");
@@ -3376,7 +3386,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3408,7 +3418,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
}

8
CraftBukkit-Patches/0020-Prevent-Ghost-Players-Caused-by-Plugins.patch
View file

@ -1,4 +1,4 @@
From 0b9abd4f66fe66a85cee872fd358784d87b5428e Mon Sep 17 00:00:00 2001
From a1c0430f895035562d026b1c1ed7c5594d1a5a9c Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index 46ae3b4db9..4b62a39438 100644
index 7ab3bf7461..f8d5361fa0 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -1121,6 +1121,11 @@ public class EntityPlayer extends EntityHuman {
@ -22,10 +22,10 @@ index 46ae3b4db9..4b62a39438 100644
location = respawnEvent.getRespawnLocation();
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c4e3dce4cc..6c1492635c 100644
index 2b4bc82bf2..db58be830a 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -705,6 +705,11 @@ public abstract class PlayerList {
@@ -706,6 +706,11 @@ public abstract class PlayerList {
} else {
dimensiontransition = new DimensionTransition(((CraftWorld) location.getWorld()).getHandle(), CraftLocation.toVec3D(location), Vec3D.ZERO, location.getYaw(), location.getPitch(), DimensionTransition.DO_NOTHING);
}

6
CraftBukkit-Patches/0023-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From 5782d1f70e0db061665b6f792b609ba5117204ed Mon Sep 17 00:00:00 2001
From d0a73c9c7aaa940da79664e2f332ef664913457e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
@ -64,7 +64,7 @@ index 2fc7fbbf34..b4912751c1 100644
public org.bukkit.Server.Spigot spigot()
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 0000000000..d7e7198ca2
index 0000000000..f78961aa1a
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,131 @@
@ -127,7 +127,7 @@ index 0000000000..d7e7198ca2
+ // Kick all players
+ for ( EntityPlayer p : (List<EntityPlayer>) MinecraftServer.getServer().getPlayerList().players )
+ {
+ p.connection.disconnect( CraftChatMessage.fromStringOrEmpty( SpigotConfig.restartMessage ) );
+ p.connection.disconnect( CraftChatMessage.fromStringOrEmpty( SpigotConfig.restartMessage, true ) );
+ }
+ // Give the socket a chance to send the packets
+ try

10
CraftBukkit-Patches/0061-Add-Hunger-Config-Values.patch
View file

@ -1,11 +1,11 @@
From 5a07b250e4301b75043e25e6736182caa8aa0628 Mon Sep 17 00:00:00 2001
From b5d534f9573f56fca2f2b61abcee286a02b12562 Mon Sep 17 00:00:00 2001
From: lazertester <austin.techhead@gmail.com>
Date: Sun, 17 Aug 2014 19:56:17 +1000
Subject: [PATCH] Add Hunger Config Values
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index 4b62a39438..29bb930521 100644
index f8d5361fa0..1a09336626 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -1673,19 +1673,19 @@ public class EntityPlayer extends EntityHuman {
@ -49,10 +49,10 @@ index 4b62a39438..29bb930521 100644
}
} else if (this.isFallFlying()) {
diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
index 7ef76e9ef3..01a85c5ad4 100644
index 184c2d634b..8441101722 100644
--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
+++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
@@ -1427,7 +1427,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1428,7 +1428,7 @@ public abstract class EntityHuman extends EntityLiving {
}
}
@ -61,7 +61,7 @@ index 7ef76e9ef3..01a85c5ad4 100644
} else {
this.level().playSound((EntityHuman) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F);
// CraftBukkit start - resync on cancelled event
@@ -1586,9 +1586,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1587,9 +1587,9 @@ public abstract class EntityHuman extends EntityLiving {
super.jumpFromGround();
this.awardStat(StatisticList.JUMP);
if (this.isSprinting()) {

8
CraftBukkit-Patches/0067-Use-Map-for-getPlayer-String-lookup.patch
View file

@ -1,11 +1,11 @@
From 157dd5867d3656080e840c2b40ea35464417bd8c Mon Sep 17 00:00:00 2001
From 243b7fbfd9f1d32abe1beb73ce335e0fb068fff1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:05:15 +1000
Subject: [PATCH] Use Map for getPlayer(String) lookup.
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c57272380b..1eefc37bd6 100644
index 478e6e3b1c..eec78b9001 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -158,6 +158,7 @@ public abstract class PlayerList {
@ -40,7 +40,7 @@ index c57272380b..1eefc37bd6 100644
entityplayer.serverLevel().removePlayerImmediately(entityplayer, entity_removalreason);
/* CraftBukkit start
DimensionTransition dimensiontransition = entityplayer.findRespawnPositionAndUseSpawnBlock(flag, DimensionTransition.DO_NOTHING);
@@ -753,6 +757,7 @@ public abstract class PlayerList {
@@ -754,6 +758,7 @@ public abstract class PlayerList {
if (!entityplayer.connection.isDisconnected()) {
worldserver.addRespawnedPlayer(entityplayer1);
this.players.add(entityplayer1);
@ -48,7 +48,7 @@ index c57272380b..1eefc37bd6 100644
this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
}
// entityplayer1.initInventoryMenu();
@@ -977,17 +982,7 @@ public abstract class PlayerList {
@@ -978,17 +983,7 @@ public abstract class PlayerList {
@Nullable
public EntityPlayer getPlayerByName(String s) {

6
CraftBukkit-Patches/0072-Add-log-villager-deaths-option.patch
View file

@ -1,14 +1,14 @@
From 65304ca0ad56ee8dcdec43bb60b539a47584ca95 Mon Sep 17 00:00:00 2001
From 01d8bdac18e80605c15d26b792a9961315fef7bf Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 14 Dec 2019 10:26:52 +1100
Subject: [PATCH] Add log-villager-deaths option
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index a65e2f22fd..2fe2c452f3 100644
index b88eee0db4..90203ac5d5 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -1683,7 +1683,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -1693,7 +1693,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
if (!this.level().isClientSide && this.hasCustomName()) {