Merge remote-tracking branch 'origin/rewrite' into rewrite

olijeffers0n · Sep 6, 2024 · 6a86664 · 6a86664
2 parents 7e1230b + db0cc81
commit 6a86664
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/rustplus.proto b/rustplus.proto
@@ -129,6 +129,7 @@ enum AppMarkerType {
 	Crate = 6;
 	GenericRadius = 7;
 	PatrolHelicopter = 8;
+	TravelingVendor = 9;
 }
 
 message AppRequest {

diff --git a/rustplus/remote/rustplus_proto/rustplus.py b/rustplus/remote/rustplus_proto/rustplus.py
diff --git a/rustplus/structs/rust_marker.py b/rustplus/structs/rust_marker.py
@@ -93,6 +93,7 @@ class RustMarker(Serializable):
     CrateMarker = 6
     RadiusMarker = 7
     PatrolHelicopterMarker = 8
+    TravelingVendor = 9
 
     def __init__(self, data: AppMarker) -> None:
         self._id: int = data.id