Commit Graph
100 Commits
Author SHA1 Message Date
Mariell Hoversholm e37ce6b5de docs: drop table of contents; it's built into GH 2021-09-02 08:14:56 +02:00
Mariell Hoversholm f69015a417 docs: remove Paper tool method for patch mods
We no longer have the `paper` script around, and as such the docs for it are
stale, and we should remove them.

This additionally adds a tiny note about compilation possibly failing when you
work without a complete patch-set.
2021-09-02 08:14:17 +02:00
Mariell Hoversholm 889718222e Add timeout & interval to sysout catcher (#6383) 2021-08-21 17:01:42 +02:00
Mariell Hoversholm cdb63d6ad0 refactor: do not import List; use FQN
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-08-06 13:57:36 +02:00
Mariell Hoversholm 7df3240f80 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:
e0598aa2 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter

CraftBukkit Changes:
2cdc6b1e4 SPIGOT-6692: Add sendSignChange overload with a hasGlowingText parameter
2021-08-05 21:53:50 +02:00
Mariell Hoversholm 7167583c8a fix: promote slf4j-api to api scope (#6343)
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-08-06 18:01:18 +02:00
Mariell Hoversholm 9ff41ed426 fix: boats' bounding boxes must be deflated, not inflated (#6314)
Fixes GH-6312.

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-08-03 12:13:43 +02:00
Mariell Hoversholm cabbb6de8d feat: new maven group: io.papermc.paper
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 21:35:53 +02:00
Mariell Hoversholm 49118ce1b3 fix: map parent method where CB does not
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 21:08:51 +02:00
Mariell Hoversholm ceecde4a32 fix: the server compiles
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:33:36 +02:00
Mariell Hoversholm 041a42e0e4 fix: closer to compilable
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:26:56 +02:00
Mariell Hoversholm 725ba53b4b fix: remove #isStopping check
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:16:11 +02:00
Mariell Hoversholm 5fe78fe2b1 fix: remove empty java file
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:08:26 +02:00
Mariell Hoversholm 08ced2fad8 fix: add pom changes to gradle
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:06:01 +02:00
Mariell Hoversholm cbb039f6b0 fix: up the max memory for gradle
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:02:47 +02:00
Mariell Hoversholm a849e9f4b0 ci: remove java 8 build
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 19:56:25 +02:00
Mariell Hoversholm ee3cf8cc09 More remapped patches
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 17:52:05 +02:00
Mariell Hoversholm ab79a948f5 Rename all patches to correct numbering scheme
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 15:46:44 +02:00
Mariell Hoversholm 66b67abbef Apply a few more patches
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 15:46:25 +02:00
Mariell Hoversholm aafaccad78 Rename POM changes to build system changes
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:33:08 +02:00
Mariell Hoversholm 656297e209 Remap POM changes patch
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:31:17 +02:00
Mariell Hoversholm cc1564ab71 [CI-SKIP] ci: update setup-java action (#5710)
* ci: update setup-java action
* ci: change java distribution to adopt

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-05-23 14:18:19 +02:00
Mariell Hoversholm ed222051a7 ci: replace Java 11 with Java 16 in GH Actions build flow (#5709)
* ci: add Java 16 to GH Actions build flow

With our new dependence on Java 16+ as of Minecraft 1.17 (refer to:
https://www.minecraft.net/en-us/article/minecraft-snapshot-21w19a), we
should also ensure everything we merge builds on Java 16.

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>

* ci: remove Java 11 from build flow

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-05-23 14:12:50 +02:00
Mariell Hoversholm 04dd5cbf5e [CI-SKIP] Ignore .gitignore
A `.gitignore' will make packages such as
`net.minecraft.world.entity.ai.goal.**target**` be ignored. This causes
the entire patch to not apply, which is very suspicious. This commit
adds a `--force' parameter to the `git add' command we run, as per `man
git-add':

```
       -f, --force
           Allow adding otherwise ignored files.
```

The global configuration file was proven problematic, then fixed by
this by commit by Prof_Bloodstone#0123 and thekinrar#0001 on Discord
(`#paper-dev').

CI-SKIP: This does not apply to the CI, therefore it is not worthy of
its own build.
2021-03-19 18:25:18 +01:00
Mariell Hoversholm 8bafc17d67 apply fixup
I managed to move it, yet forgot to actually fix it up...
2021-03-19 07:50:12 +01:00
Mariell Hoversholm 4ff6e86500 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:
4e5f46cb Update ASM version

CraftBukkit Changes:
d54b500d Prepare for Java 16
2021-03-17 17:37:12 +01:00
Mariell Hoversholm 597f326302 wtf is this t file -jmp 2021-03-17 11:18:04 +01:00
Mariell Hoversholm 2d21a9f100 fix compile 2021-03-17 10:47:08 +01:00
Mariell Hoversholm 61ccf4bd87 rebase 2021-03-17 10:20:38 +01:00
Mariell Hoversholm ebbbfa4e37 Revert de5f4e469...c270abe96 2021-03-16 19:43:56 +01:00
Mariell Hoversholm 1ecd8a1ca7 script & POM fix 2021-03-16 19:41:20 +01:00
Mariell Hoversholm 2a17719272 Replace ** with * (BSD/macOS) 2021-03-16 19:34:40 +01:00
Mariell Hoversholm b7bfc81de4 Don't remove the .java 2021-03-16 19:31:27 +01:00
Mariell Hoversholm aa3cd67b54 Fix macOS/BSD support 2021-03-16 19:26:49 +01:00
Mariell Hoversholm e7ae17022f Link correctly 2021-03-16 18:31:01 +01:00
Mariell Hoversholm 8e7a9cdae4 Rename work dir 2021-03-16 18:30:17 +01:00
Mariell Hoversholm 2d847f7478 Actually fix preloading this time 2021-03-16 17:51:13 +01:00
Mariell Hoversholm 3052fe18f6 Fix class preloading 2021-03-16 17:47:15 +01:00
Mariell Hoversholm 555df3decc It's mojang math, not minecraft math 2021-03-16 17:39:56 +01:00
Mariell Hoversholm 9214bd49ba Apply fixups 2021-03-16 17:37:33 +01:00
Mariell Hoversholm dc29362b55 Use revision file 2021-03-16 17:35:55 +01:00
Mariell Hoversholm 6ea816d217 Welcome to 1.16.5-R0.2 2021-03-16 17:09:07 +01:00
Mariell Hoversholm f63acc3d72 Change cache keys 2021-03-16 17:02:53 +01:00
Mariell Hoversholm c9ba11e0fc more work 2021-03-16 17:00:33 +01:00
Mariell Hoversholm 0750bfaf8c It compiles 2021-03-16 16:50:45 +01:00
Mariell Hoversholm 908c938d0c More work 2021-03-16 14:04:28 +01:00
Mariell Hoversholm 2f8f0f1f81 Add PlayerInsertLecternBookEvent 2020-08-29 21:55:41 +02:00
Mariell Hoversholm 930599fcbf Respect teams in legacy chat name if configured (#5321) 2021-03-09 00:14:49 +01:00
Mariell Hoversholm afe9f61c4c [CI-SKIP] Always check PATH for JDK (#5315) 2021-03-06 14:50:24 +01:00
Mariell HoversholmandRiley Park cd9197ab62 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-"c7e0a94a2"]
	at net.minecraft.server.v1_16_R2.JsonList.load(JsonList.java:190) ~[paper-1.16.3.jar:git-Paper-"c7e0a94a2"]
	at net.minecraft.server.v1_16_R2.DedicatedPlayerList.y(SourceFile:95) ~[paper-1.16.3.jar:git-Paper-"c7e0a94a2"]
	...
```

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 <rileysebastianpark@gmail.com>
2020-11-01 16:43:31 +01:00
Mariell Hoversholm 04fbd54c3b fix: legacy component serialisation was wiped out
When merging 2e419805ad, 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:02:06 +01:00
Mariell Hoversholm 31433b07f6 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 18:54:48 +01:00
Mariell Hoversholm 0677694e78 Updated Upstream (CraftBukkit/Spigot) (#5169) 2021-02-05 23:52:27 +01:00
Mariell Hoversholm 61ccc53707 Fix javadoc build 2021-01-30 14:37:07 +01:00
Mariell Hoversholm bf531c215a Add javadoc step to GH Actions 2021-01-30 14:33:22 +01:00
Mariell Hoversholm 03168769b9 Collision option for requiring a player participant
Closes #614.
2020-11-14 16:49:03 +01:00
Mariell Hoversholm 08145dcb9d Add sendOpLevel API 2020-12-29 15:04:24 +01:00
Mariell Hoversholm f463a0b97c Empty commands shall not be dispatched
Fixes PaperMC/Paper#5018.
2021-01-06 23:41:42 +01:00
Mariell Hoversholm 542d7df36b Support spawning item stacks 2020-11-14 19:11:20 +01:00
Mariell Hoversholm 5a8ce7f006 Fix sign lazy initialisation
Fixes PaperMC/Paper#4975
2021-01-01 14:35:38 +01:00
Mariell 04d4054c16 [CI-SKIP] Deprecate the view distance APIs on Player (#4945) 2020-12-27 12:37:37 +01:00
Mariell Hoversholm 889192e8f8 Fix merging spawning values 2020-12-05 14:59:05 +01:00
Mariell Hoversholm db1f178a92 Patch 2 references an invalid variable 2020-11-14 16:54:25 +01:00
Mariell Hoversholm 5d66ba7613 Add API for quit reason
The following has been tested:
- Disconnect from menu -> DISCONNECTED
- EssentialsX kick -> KICKED
- Suspend server JVM -> DISCONNECTED
- Suspend client JVM -> TIMED_OUT
- Call #exceptionCaught -> ERRONEOUS_STATE

Suspension was done through `kill -STOP` and subsequently `kill -CONT`
after the player has (been) disconnected.

Closes #254.
2020-11-14 16:23:10 +01:00
Mariell Hoversholm e23a6d6674 Updated Upstream (CraftBukkit)
Upstream has released updates that appears 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:
23618b2c SPIGOT-6240: Use correct portal search radius
2020-11-13 20:07:38 +01:00
Mariell Hoversholm c451989b86 Add ignore discounts API 2020-11-09 20:45:38 +01:00
Mariell Hoversholm 58c9443d76 Toggle for removing existing dragon 2020-09-30 22:52:29 +02:00
Mariell 27979ca2fa Updated Upstream (Spigot) (#4745)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Spigot Changes:
a19903d2 SPIGOT-520: Add option to disable player data saving
2020-11-08 11:00:43 +01:00
Mariell 0b2f49cb81 OBFHELPERS (#4733) 2020-11-03 22:30:15 +01:00
MariellandChew c7e0a94a2b [CI-SKIP] Add a GitHub Actions job (#4703)
Co-Authored-By: Chew <chew@chew.pw>

Co-authored-by: Chew <chew@chew.pw>
2020-10-28 22:01:09 +01:00
Mariell 81113bd07b Make fireworks call PlayerLaunchProjectileEvent (#4698) 2020-10-27 23:01:32 +01:00
Mariell 7811aecad6 Updated Upstream (Bukkit/CraftBukkit) (#4688)
Upstream has released updates that appears 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:
4abf9e96 #557: Add TNTPrimed#setSource method

CraftBukkit Changes:
dea41389 Remove outdated build delay.
9da3b5bf #762: Add TNTPrimed#setSource method
2020-10-26 16:02:55 +01:00
Mariell 03ce97a3cc BukkitValues was renamed ChunkBukkitValues (#4664)
I blame cat!
2020-10-17 22:53:51 +02:00
Mariell 2d4ed8726c Updated Upstream (CraftBukkit) (#4663) 2020-10-17 22:42:18 +02:00
MariellandShane Freeder db28a6b208 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4659)
Upstream has released updates that appears 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:
01e22e09 Misc maven build updates
746f5324 #556: Allow sending messages from specific UUIDs
92b99cde #501: Add PersistentDataHolder to Chunk

CraftBukkit Changes:
4ef13f94 Misc maven build updates
04639f5a #759: Allow sending messages from specific UUIDs
77c894a2 #672: Add PersistentDataHolder to Chunk

Spigot Changes:
57bbdd8e Rebuild patches

Co-authored-by: Shane Freeder <theboyetronic@gmail.com>
2020-10-17 12:39:45 +02:00
Mariell Hoversholm 478597ea05 Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears 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:
e461dcfe #555: Item - add getters/setters for owner/thrower

CraftBukkit Changes:
055870c4 #758: Item - add getters/setters for owner/thrower
2020-10-14 16:00:43 +02:00
Mariell 5bdf0f1b1a Updated Upstream (CraftBukkit) (#4622)
Upstream has released updates that appears 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:
1f4693a8 SPIGOT-6168: Fix error with Player.getBedSpawnLocation when world is unloaded while server running
2020-10-06 15:59:35 +02:00
Mariell eb2557d9ac Add a missing return in Eigencraft redstone (#4621) 2020-10-05 18:03:41 +02:00
Mariell Hoversholm 5cd73bbd5a Update Paperclip; use mvn.cmd on Windows (jmanpenilla) 2020-10-03 10:15:44 +02:00
Mariell Hoversholm ae82e7eb1c Updated Upstream (CraftBukkit)
Upstream has released updates that appears 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:
5c77bd28 SPIGOT-6147: InventoryCloseEvent does not fire after closing player inventory
2020-10-01 15:16:32 +02:00
Mariell cc79d358e8 [CI-SKIP] Make travis use 'build' instead of 'patch' (#4592)
Closes #4277.
2020-09-30 22:19:02 +02:00
Mariell Hoversholm e3bbc0d3ec Updated Upstream (CraftBukkit)
Upstream has released updates that appears 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:
5da21f87 SPIGOT-6152: End exit gates in custom ends do not send back to overworld
1ee373fe SPIGOT-6157: Crash when PortalCreateEvent cancelled
2020-09-30 21:12:34 +02:00
Mariell Hoversholm 6fea984629 Updated Upstream (CraftBukkit)
Upstream has released updates that appears 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:
a339310c #755: Fix NPE when calling getInventory() for virtual EnderChests
2577f9bf Increase outdated build delay
1dabfdc8 #754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
2020-09-27 16:52:40 +02:00
Mariell Hoversholm f26dc668ae Patch SPIGOT-6086 for all invalid locations
md_5's patch for SPIGOT-6086 only applies to locations over the world,
not those under or outside it.
2020-09-27 16:32:04 +02:00
Mariell Hoversholm fc0dafdc58 Prevent fire from spreading to invalid locations 2020-09-21 20:40:48 +02:00
Mariell 0a05b29148 Updated Upstream (CraftBukkit/Spigot) (#4318)
Upstream has released updates that appears 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:
d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+

Spigot Changes:
2740d5ae Rebuild patches
2020-09-12 21:57:21 +02:00
MariellandBillyGalbreath a67734d483 Add zombie targets turtle egg config (#4181)
Co-authored-by: BillyGalbreath <Blake.Galbreath@GMail.com>
2020-08-30 20:27:50 +02:00
Mariell Hoversholm 824434ec41 Update Paperclip 2020-08-30 10:22:26 +02:00
Mariell Hoversholm 422914ef9d Increase visibility of a few methods
Fixes PaperMC/Paper#4094.
2020-08-28 21:40:31 +02:00
Mariell Hoversholm 4ffde966fe PortalCreateEvent needs to know its entity
Fixes PaperMC/Paper#4076.
2020-08-21 20:58:20 +02:00
Mariell Hoversholm e7ec1f421f Port Eigencraft to 1.16 2020-08-04 12:23:54 +02:00
Mariell HoversholmandAikar 4a213fd1ef Restore Pathfinder Optimizations from 1.15.2
We dropped the patch in 1.16.1 update due to it being a major conflict.
This restores it.

Co-Authored-By: Aikar <aikar@aikar.co>
2020-08-06 22:51:29 -04:00
Mariell Hoversholm 9b4ddafa60 Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears 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:
eeb1042f #491: Add support to change block's lid state

CraftBukkit Changes:
8fb65851 #660: Add support to change block's lid state
2020-07-29 21:50:16 +02:00
Mariell Hoversholm 4d79d13b66 Fix PersistentDataContainer contract violation (_->!null returns null) 2020-07-24 01:09:57 +02:00
Mariell Hoversholm 72b23c419b [CI-SKIP] Revitalise CONTRIBUTING.md 2020-07-14 18:22:51 +02:00
Mariell 0df99cedeb Only get spawn block if it's relevant, fixes #3934 (#3942) 2020-07-19 14:58:29 +02:00
Mariell 827e6cec16 Fix zero reputation deleting villagers (#3857) 2020-07-17 19:47:04 +02:00
Mariell 4455020aa4 Fix Villagers WeightedList issue (#3860)
dont clone the list for villagers as the list is accessed post sort and needs to have sorted data.
2020-07-08 21:57:24 +02:00
Mariell 706761b531 Fix piston dupe patch creating ghost blocks (#3603)
The 2 flag (send change to clients) must always be set. If it is only set
when the `map.replace` call before it does something, as was suggested
on Discord, the issue will not change whatsoever.

Fixes #3593
2020-06-23 01:00:00 +02:00
Mariell Hoversholm 0de2f11f56 Add clear reputation API 2020-05-26 21:49:02 +02:00