3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-16 13:00:06 +01:00
Commit graph

5857 Commits

Autor SHA1 Nachricht Datum
Mariell Hoversholm
fcc6d33590 Throw proper exception on empty JsonList file
Related to #4174, #4717.

As it stands, `JsonList` throws an NPE on `jsonarray.iterator()` when
the reader given is at EOF. This means there is an unintelligible
message shown to the player:

```
[16:44:31 ERROR]: Encountered an unexpected exception
java.lang.NullPointerException: Cannot invoke "com.google.gson.JsonArray.iterator()" because "jsonarray" is null
	at net.minecraft.server.v1_16_R2.JsonList.load(JsonList.java:192) ~[patched_1.16.3.jar:git-Paper-248]
	at net.minecraft.server.v1_16_R2.DedicatedPlayerList.y(SourceFile:95) ~[patched_1.16.3.jar:git-Paper-248]
	...
```

This is clearly not understandable to the untrained eye: what is
`jsonarray`? What is `DedicatedPlayerList.y`?

This rather does a proper exception message:

```
[16:42:59 ERROR]: Encountered an unexpected exception
java.lang.NullPointerException: The file "banned-players.json" is either empty or corrupt
	at com.google.common.base.Preconditions.checkNotNull(Preconditions.java:787) ~[paper-1.16.3.jar:git-Paper-"8e6d90c2d"]
	at net.minecraft.server.v1_16_R2.JsonList.load(JsonList.java:190) ~[paper-1.16.3.jar:git-Paper-"8e6d90c2d"]
	at net.minecraft.server.v1_16_R2.DedicatedPlayerList.y(SourceFile:95) ~[paper-1.16.3.jar:git-Paper-"8e6d90c2d"]
	...
```

It is still an exception, which server owners may or may not understand,
but the message now says exactly what went wrong, and who would've
known, now we know what `DedicatedPlayerList.y` is, and we know what
file was broken.

This is more of a quality of life change, but it is certainly useful to
the server owners that come into `#paper-help` and the issue tracker
(#4174) to ask for help with unintelligible messages we need to open a
patched Paper project to make any sense out of.

Check state of jsonarray instead of checkNotNull

Co-authored-by: Riley Park <riley.park@meino.net>
2021-03-03 21:56:04 +01:00
Jake Potrebic
17d2e1291e Fix interact event in adventure mode 2021-03-03 21:44:30 +01:00
TheShermanTanker
964e0bf42b MC-29274: Fix Wither hostility towards players 2021-03-03 21:35:57 +01:00
Eric Su
9e24a52137 Fixed furnace cook-speed multiplier losing precision when calculating cook time 2021-03-03 21:08:15 +01:00
lukas81298
c7e42faa36 Do not create unnecessary copies of the passenger list 2021-03-03 20:55:13 +01:00
Jake Potrebic
40881ad673 added tnt minecarts to the tnt height nerf 2021-03-03 20:42:47 +01:00
Bjarne Koll
26be708f45 Remove streams from SensorNearest
The behavioural nearby sensors are validated every tick on the entities
that registered the respective sensors and are therefore a good subject
to performance improvements.

More specifically this commit replaces the Stream#filter usage with
ArrayList#removeIf as the removeIf method on an array list is heavily
optimized towards a single internal array re-allocation without any
further overhead on the removeIf call.

The only negative of this change is the rather agressive diff these
patches introduce as the methods are basically being reimplemented
compared to the previous stream-based implementation.

See: https://nipafx.dev/java-stream-performance/
Note: Updated LICENCE.md to release this commit under MIT
2021-03-03 20:26:44 +01:00
MiniDigger
5b5989b213 fix nullability of playerlist header/footer, closes #5290 2021-03-03 20:14:05 +01:00
Jason
45bc531dd3
Fix Material#getTranslationKey for Block Materials (#5294)
* Fix Material#getTranslationKey for Block Materials

* Cache the result of Material#isBlock
2021-03-02 16:27:34 -08:00
Riley Park
60e92c061b
fix #5292 with help from @JRoy 2021-03-02 08:39:36 -08:00
Riley Park
9907cedecb
New chat events for better Adventure support (#5289)
Bump Adventure to 4.6.0

fixes #5216
fixes #5261
fixes #5287
2021-03-01 19:07:12 -08:00
Camotoy
06900aef5e
Fix username connecting with no texture being overwritten by usercache (#4970) 2021-03-01 21:06:05 +00:00
Riley Park
df4c68b669
fix #5279 - clickable links again 2021-02-28 18:40:19 -08:00
Michael
ff5ff3af40
Print command usage for /paper entity list at more places (#5282) 2021-02-28 17:01:26 -06:00
Paul Zhang
5d779a6212 Implements PlayerHandshakeEvent#getOriginalSocketAddressHostname and deprecates PlayerHandshakeEvent(String, boolean) in favour of PlayerHandshakeEvent(String, String, boolean) 2021-02-27 15:43:33 +01:00
Tom
6fab1ee3aa Expose Tracked Players
A lot of plugins seem to use reflection to determine this, so this could be a bit of a starter-patch as future PR'ers could also exposed tracked entities as well.
2021-02-27 15:34:33 +01:00
Tom
b53a650a59 Clear SyncLoadInfo 2021-02-27 15:28:26 +01:00
Mariell Hoversholm
c02c22fde5 fix: legacy component serialisation was wiped out
When merging 4e958e229f, nobody caught the
fact we removed the component serialisation of legacy BungeeCord Chat
API components in the PacketPlayOutTitle class.

Test plugin code:

```kotlin
class LegacyMessageCommand : BaseCommand() {
    override fun register(manager: PaperCommandManager<CommandSender>) {
        manager.command(manager.commandBuilder("legacymsg")
            .sender<Player>()
            .handler {
                val component = ComponentBuilder("Test")
                    .color(ChatColor.DARK_RED)
                    .bold(true)
                    .append(" message")
                    .bold(false)
                    .color(ChatColor.of("#f8a8a8"))
                    .event(
                        HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
                            Text(
                                ComponentBuilder("Test hover")
                                    .color(ChatColor.AQUA)
                                    .underlined(true)
                                    .create()
                            )
                        )
                    )
                    .event(
                        ClickEvent(
                            ClickEvent.Action.SUGGEST_COMMAND,
                            "/legacymsg"
                        )
                    )
                    .create()
                it.sender.sendMessage(*component)
                it.sender.sendActionBar(*component)
                it.sender.sendTitle(
                    Title.builder()
                        .title(component)
                        .subtitle(component)
                        .fadeIn(40)
                        .stay(60)
                        .fadeOut(40)
                        .build()
                )
            })
    }
}
```

Fixes GH-5271.
2021-02-27 12:46:57 +01:00
Mariell Hoversholm
2dd5dccf00
Add config option for displayname in quit message (#5260)
This restores the behaviour to vanilla by default, but may be changed if
one wants to.

Fixes #5259.
2021-02-26 17:54:48 +00:00
Josh Roy
63fe5e4b77 Fix further issues with rgb text pattern matching 2021-02-25 19:38:56 +01:00
Shane Freeder
89be8185db
Don't grab the threads stacktrace when dumping same thread
For some reason, this doesn't always seem to capture all states of shutdown,
either the logger is just being fun, or, potentially, the thread is already
marked as dead when we're getting called so the trace is not generated through
the method on Thread
2021-02-24 18:45:21 +00:00
Aikar
ca4c781d83
[Auto] Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
95ff95ed #588: Add Player#sendBlockDamage()

CraftBukkit Changes:
ea050e6e9 #807: Add Player#sendBlockDamage()
2021-02-24 04:32:17 -05:00
Riley Park
6ae2121257
Display name should never be null 2021-02-23 16:48:02 -08:00
Aurora
bf2f8aeaf6
Add @NotNull to Key in org.bukkit.sound (#5241)
Fix compiling
2021-02-23 16:20:52 -08:00
Riley Park
01f9b65f90
Sound can implement Adventure's Sound.Type 2021-02-23 15:45:26 -08:00
Riley Park
aa282a1a04
Don't try to deserialize a null string in legacy method 2021-02-23 13:40:49 -08:00
Aikar
9bcd08cb3c
[CI-SKIP] [Auto] Rebuild Patches
A recent commit has been made that caused patches to be out of order, rebuilding
2021-02-23 16:11:50 -05:00
Aikar
ea6fd6076c
[Auto] Updated Upstream (Bukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
fcbd2266 #587: Fix various javadoc typos
2021-02-23 16:10:04 -05:00
Shane Freeder
d9b02e94d2
Misc thread dumps (#5200) 2021-02-23 21:06:12 +00:00
Riley Park
a0093e142b
Adventure 4.5.1 2021-02-23 11:20:15 -08:00
MeFisto94
afea0e8abf
Add links to the Adventure javadocs
fixes #5239
2021-02-23 11:20:04 -08:00
Jason
846783c8ab
Fix a couple of typos in the javadoc for Player (#5235) 2021-02-23 05:46:02 -08:00
Jason
a2574d8f5e
Replace usages of LegacyComponentSerializer.legacySection() in Paper-Server with PaperAdventure.LEGACY_SECTION_UXRC (#5233) 2021-02-23 05:45:09 -08:00
Jason
cae142b85d
Enable Hex colors on PaperAdventure.LEGACY_SECTION_UXRC, and use it for sending messages to console command sender (#5230)
This fixes messages to console having colors stripped, and also fixes colors being downsampled in PlayerConnection#disconnect(String)
2021-02-22 22:43:49 -08:00
chickeneer
c1635eabb4 PlayerDeathEvent#getDeathMessage should provide translation for legacy reasons #5227 2021-02-23 04:10:41 +01:00
Josh Roy
3f74af2028
Fix Log4J converter not parsing hex without named colors (#5228) 2021-02-23 02:43:05 +00:00
Riley Park
d5cb9308f2
fix #5224 2021-02-22 10:24:44 -08:00
Riley Park
d23f8b62ef
fix? #5222 2021-02-22 06:15:22 -08:00
Riley Park
0f2575de29
fix? #5222 2021-02-22 05:33:41 -08:00
Riley Park
7c3499702e
fix? #5218 2021-02-22 04:31:51 -08:00
Riley Park
c8eec830b5
fix #5217 2021-02-22 03:12:40 -08:00
Riley Park
a235c77ce7
Adventure 4.5.0 2021-02-22 02:52:30 -08:00
Riley Park
511cd52f02
fix #5214 2021-02-22 01:53:53 -08:00
Riley Park
33d4f608ba
fix stupid legacy chat garbage 2021-02-22 00:45:21 -08:00
Riley Park
a1eebfea96
fix #5212 and #5213 2021-02-22 00:20:23 -08:00
MiniDigger | Martin
4668201606
Upstream Update (#5211) 2021-02-21 20:55:01 +00:00
Josh Roy
2a0ee4b65d Add support for hex color codes in console 2021-02-21 21:05:42 +01:00
Riley Park
4e958e229f
We're going on an Adventure! (#4842)
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: zml <zml@stellardrift.ca>
Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-02-21 20:45:33 +01:00
Bierque Jason
1a97356116
Stop loop when flags set to false (#5101) 2021-02-21 12:34:08 +00:00
Aikar
a5928db4a8
[Auto] Updated Upstream (CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
b7eed2546 SPIGOT-6307: Allow chest locks with legacy color codes to match against items with json colors
2021-02-20 18:06:30 -05:00